Change _getDimension to _getDimensions

chartjs · Jun 19, 2019 · 49c13c2 · 49c13c2
1 parent 4087df5
commit 49c13c2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git 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 dimension;
+	var dimensions;
 
 	if (offsetGridLines) {
 		if (scale.getTicks().length === 1) {
-			dimension = scale._getDimension();
-			lineValue -= Math.max(lineValue - dimension.start, dimension.end - lineValue);
+			dimensions = scale._getDimensions();
+			lineValue -= Math.max(lineValue - dimensions.start, dimensions.end - lineValue);
 		} else if (index === 0) {
 			lineValue -= (scale.getPixelForTick(1) - lineValue) / 2;
 		} else {
@@ -652,7 +652,7 @@ var Scale = Element.extend({
 	/**
 	 * @private
 	 */
-	_getDimension: function() {
+	_getDimensions: function() {
 		var me = this;
 		if (me.isHorizontal()) {
 			return {

diff --git a/src/scales/scale.category.js b/src/scales/scale.category.js
@@ -59,7 +59,9 @@ module.exports = Scale.extend({
 	convertTicksToLabels: function() {
 		var me = this;
 
+		// Storing the original labels as they can be modified by user's callback
 		me._tickValues = me.ticks.slice();
+
 		Scale.prototype.convertTicksToLabels.call(me);
 	},
 
@@ -81,8 +83,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 dimension = me._getDimension();
-		var valueDimension = dimension.size / offsetAmt;
+		var dimensions = me._getDimensions();
+		var valueDimension = dimensions.size / offsetAmt;
 		var valueCategory, labels, idx, pixel;
 
 		if (!isNullOrUndef(index) && !isNullOrUndef(datasetIndex)) {
@@ -107,7 +109,7 @@ module.exports = Scale.extend({
 			pixel += valueDimension / 2;
 		}
 
-		return options.ticks.reverse ? dimension.end - pixel : dimension.start + pixel;
+		return options.ticks.reverse ? dimensions.end - pixel : dimensions.start + pixel;
 	},
 
 	getPixelForTick: function(index) {
@@ -122,11 +124,11 @@ module.exports = Scale.extend({
 		var offset = options.offset;
 		var tickCount = me._ticks.length;
 		var offsetAmt = Math.max(tickCount - (offset ? 0 : 1), 1);
-		var dimension = me._getDimension();
-		var valueDimension = dimension.size / offsetAmt;
+		var dimensions = me._getDimensions();
+		var valueDimension = dimensions.size / offsetAmt;
 		var value;
 
-		pixel = options.ticks.reverse ? dimension.end - pixel : pixel - dimension.start;
+		pixel = options.ticks.reverse ? dimensions.end - pixel : pixel - dimensions.start;
 
 		if (offset) {
 			pixel -= valueDimension / 2;

diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js
@@ -724,11 +724,11 @@ module.exports = Scale.extend({
 	getPixelForOffset: function(time) {
 		var me = this;
 		var offsets = me._offsets;
-		var dimension = me._getDimension();
+		var dimensions = me._getDimensions();
 		var pos = interpolate(me._table, 'time', time, 'pos');
-		var offset = dimension.size * (offsets.start + pos) / (offsets.start + 1 + offsets.end);
+		var offset = dimensions.size * (offsets.start + pos) / (offsets.start + 1 + offsets.end);
 
-		return me.options.ticks.reverse ? dimension.end - offset : dimension.start + offset;
+		return me.options.ticks.reverse ? dimensions.end - offset : dimensions.start + offset;
 	},
 
 	getPixelForValue: function(value, index, datasetIndex) {
@@ -758,8 +758,8 @@ module.exports = Scale.extend({
 	getValueForPixel: function(pixel) {
 		var me = this;
 		var offsets = me._offsets;
-		var dimension = me._getDimension();
-		var pos = (dimension.size ? (pixel - dimension.start) / dimension.size : 0) * (offsets.start + 1 + offsets.end) - offsets.start;
+		var dimensions = me._getDimensions();
+		var pos = (dimensions.size ? (pixel - dimensions.start) / dimensions.size : 0) * (offsets.start + 1 + offsets.end) - offsets.start;
 		var time = interpolate(me._table, 'pos', pos, 'time');
 
 		// DEPRECATION, we should return time directly