diff --git a/src/core/core.scale.js b/src/core/core.scale.js index 8937c75bfb3..3a0ae2e523f 100644 --- a/src/core/core.scale.js +++ b/src/core/core.scale.js @@ -67,12 +67,12 @@ defaults._set('scale', { function getPixelForGridLine(scale, index, offsetGridLines) { var lineValue = scale.getPixelForTick(index); - var range; + var dimension; if (offsetGridLines) { if (scale.getTicks().length === 1) { - range = scale._getRange(); - lineValue -= Math.max(lineValue - range.start, range.end - lineValue); + dimension = scale._getDimension(); + lineValue -= Math.max(lineValue - dimension.start, dimension.end - lineValue); } else if (index === 0) { lineValue -= (scale.getPixelForTick(1) - lineValue) / 2; } else { @@ -652,7 +652,7 @@ var Scale = Element.extend({ /** * @private */ - _getRange: function() { + _getDimension: function() { var me = this; if (me.isHorizontal()) { return { diff --git a/src/scales/scale.category.js b/src/scales/scale.category.js index 2166760d01e..7ba073e4e54 100644 --- a/src/scales/scale.category.js +++ b/src/scales/scale.category.js @@ -69,8 +69,8 @@ module.exports = Scale.extend({ var options = me.options; var offset = options.offset; var offsetAmt = Math.max(me._ticks.length - (offset ? 0 : 1), 1); - var range = me._getRange(); - var valueDimension = range.size / offsetAmt; + var dimension = me._getDimension(); + var valueDimension = dimension.length / offsetAmt; var valueCategory, labels, idx, pixel; // If value is a data object, then index is the index in the data array, @@ -91,7 +91,7 @@ module.exports = Scale.extend({ pixel += valueDimension / 2; } - return options.ticks.reverse ? range.end - pixel : range.start + pixel; + return options.ticks.reverse ? dimension.end - pixel : dimension.start + pixel; }, getPixelForTick: function(index) { @@ -105,10 +105,10 @@ module.exports = Scale.extend({ var options = me.options; var offset = options.offset; var offsetAmt = Math.max(me._ticks.length - (offset ? 0 : 1), 1); - var range = me._getRange(); - var valueDimension = range.size / offsetAmt; + var dimension = me._getDimension(); + var valueDimension = dimension.size / offsetAmt; - pixel = options.ticks.reverse ? range.end - pixel : pixel - range.start; + pixel = options.ticks.reverse ? dimension.end - pixel : pixel - dimension.start; if (offset) { pixel -= valueDimension / 2; diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js index 04fde798808..0852a32d22f 100644 --- a/src/scales/scale.time.js +++ b/src/scales/scale.time.js @@ -705,11 +705,11 @@ module.exports = Scale.extend({ getPixelForOffset: function(time) { var me = this; var offsets = me._offsets; - var range = me._getRange(); + var dimension = me._getDimension(); var pos = interpolate(me._table, 'time', time, 'pos'); - var offset = range.size * (offsets.start + pos) / (offsets.start + 1 + offsets.end); + var offset = dimension.size * (offsets.start + pos) / (offsets.start + 1 + offsets.end); - return me.options.ticks.reverse ? range.end - offset : range.start + offset; + return me.options.ticks.reverse ? dimension.end - offset : dimension.start + offset; }, getPixelForValue: function(value, index, datasetIndex) { @@ -739,8 +739,8 @@ module.exports = Scale.extend({ getValueForPixel: function(pixel) { var me = this; var offsets = me._offsets; - var range = me._getRange(); - var pos = (range.size ? (pixel - range.start) / range.size : 0) * (offsets.start + 1 + offsets.end) - offsets.start; + var dimension = me._getDimension(); + var pos = (dimension.size ? (pixel - dimension.start) / dimension.size : 0) * (offsets.start + 1 + offsets.end) - offsets.start; var time = interpolate(me._table, 'pos', pos, 'time'); // DEPRECATION, we should return time directly