Further reformatted scale.linear.js to match original indenting.

This commit is contained in:
Robert Becker 2016-02-05 09:33:57 +01:00
parent 80ede9b9bb
commit 85de9fbe9c

View File

@ -1,14 +1,14 @@
(function () { (function() {
"use strict"; "use strict";
var root = this, var root = this,
Chart = root.Chart, Chart = root.Chart,
helpers = Chart.helpers; helpers = Chart.helpers;
var defaultConfig = { var defaultConfig = {
position: "left", position: "left",
ticks: { ticks: {
callback: function (tickValue, index, ticks) { callback: function(tickValue, index, ticks) {
var delta = ticks[1] - ticks[0]; var delta = ticks[1] - ticks[0];
// If we have a number like 2.5 as the delta, figure out how many decimal places we need // If we have a number like 2.5 as the delta, figure out how many decimal places we need
@ -36,7 +36,7 @@
}; };
var LinearScale = Chart.Scale.extend({ var LinearScale = Chart.Scale.extend({
buildTicks: function () { buildTicks: function() {
// First Calculate the range // First Calculate the range
this.min = null; this.min = null;
@ -45,7 +45,7 @@
if (this.options.stacked) { if (this.options.stacked) {
var valuesPerType = {}; var valuesPerType = {};
helpers.each(this.chart.data.datasets, function (dataset) { helpers.each(this.chart.data.datasets, function(dataset) {
if (valuesPerType[dataset.type] === undefined) { if (valuesPerType[dataset.type] === undefined) {
valuesPerType[dataset.type] = { valuesPerType[dataset.type] = {
positiveValues: [], positiveValues: [],
@ -58,7 +58,7 @@
var negativeValues = valuesPerType[dataset.type].negativeValues; var negativeValues = valuesPerType[dataset.type].negativeValues;
if (helpers.isDatasetVisible(dataset) && (this.isHorizontal() ? dataset.xAxisID === this.id : dataset.yAxisID === this.id)) { if (helpers.isDatasetVisible(dataset) && (this.isHorizontal() ? dataset.xAxisID === this.id : dataset.yAxisID === this.id)) {
helpers.each(dataset.data, function (rawValue, index) { helpers.each(dataset.data, function(rawValue, index) {
var value = +this.getRightValue(rawValue); var value = +this.getRightValue(rawValue);
if (isNaN(value)) { if (isNaN(value)) {
@ -81,7 +81,7 @@
} }
}, this); }, this);
helpers.each(valuesPerType, function (valuesForType) { helpers.each(valuesPerType, function(valuesForType) {
var values = valuesForType.positiveValues.concat(valuesForType.negativeValues); var values = valuesForType.positiveValues.concat(valuesForType.negativeValues);
var minVal = helpers.min(values); var minVal = helpers.min(values);
var maxVal = helpers.max(values); var maxVal = helpers.max(values);
@ -90,9 +90,9 @@
}, this); }, this);
} else { } else {
helpers.each(this.chart.data.datasets, function (dataset) { helpers.each(this.chart.data.datasets, function(dataset) {
if (helpers.isDatasetVisible(dataset) && (this.isHorizontal() ? dataset.xAxisID === this.id : dataset.yAxisID === this.id)) { if (helpers.isDatasetVisible(dataset) && (this.isHorizontal() ? dataset.xAxisID === this.id : dataset.yAxisID === this.id)) {
helpers.each(dataset.data, function (rawValue, index) { helpers.each(dataset.data, function(rawValue, index) {
var value = +this.getRightValue(rawValue); var value = +this.getRightValue(rawValue);
if (isNaN(value)) { if (isNaN(value)) {
return; return;
@ -126,11 +126,11 @@
if (this.isHorizontal()) { if (this.isHorizontal()) {
maxTicks = Math.min(this.options.ticks.maxTicksLimit ? this.options.ticks.maxTicksLimit : 11, maxTicks = Math.min(this.options.ticks.maxTicksLimit ? this.options.ticks.maxTicksLimit : 11,
Math.ceil(this.width / 50)); Math.ceil(this.width / 50));
} else { } else {
// The factor of 2 used to scale the font size has been experimentally determined. // The factor of 2 used to scale the font size has been experimentally determined.
maxTicks = Math.min(this.options.ticks.maxTicksLimit ? this.options.ticks.maxTicksLimit : 11, maxTicks = Math.min(this.options.ticks.maxTicksLimit ? this.options.ticks.maxTicksLimit : 11,
Math.ceil(this.height / (2 * this.options.ticks.fontSize))); Math.ceil(this.height / (2 * this.options.ticks.fontSize)));
} }
// Make sure we always have at least 2 ticks // Make sure we always have at least 2 ticks
@ -210,11 +210,11 @@
this.zeroLineIndex = this.ticks.indexOf(0); this.zeroLineIndex = this.ticks.indexOf(0);
}, },
getLabelForIndex: function (index, datasetIndex) { getLabelForIndex: function(index, datasetIndex) {
return +this.getRightValue(this.chart.data.datasets[datasetIndex].data[index]); return +this.getRightValue(this.chart.data.datasets[datasetIndex].data[index]);
}, },
// Utils // Utils
getPixelForValue: function (value, index, datasetIndex, includeOffset) { getPixelForValue: function(value, index, datasetIndex, includeOffset) {
// This must be called after fit has been run so that // This must be called after fit has been run so that
// this.left, this.top, this.right, and this.bottom have been defined // this.left, this.top, this.right, and this.bottom have been defined
var rightValue = +this.getRightValue(value); var rightValue = +this.getRightValue(value);