From: Jukka Kurkela <jukka.kurkela@gmail.com>
Date: Mon, 30 Dec 2019 22:14:55 +0000 (+0200)
Subject: Use ticks consistently (#6873)
X-Git-Tag: v3.0.0-alpha~176
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbd835f4f33d99395ef5951edb4deef1e2df49e0;p=thirdparty%2FChart.js.git

Use ticks consistently (#6873)
---

diff --git a/src/controllers/controller.bar.js b/src/controllers/controller.bar.js
index 7755cd14f..5f7054fbc 100644
--- a/src/controllers/controller.bar.js
+++ b/src/controllers/controller.bar.js
@@ -53,7 +53,7 @@ function computeMinSampleSize(scale, pixels) {
 		min = Math.min(min, Math.abs(pixels[i] - pixels[i - 1]));
 	}
 
-	for (i = 0, ilen = scale.getTicks().length; i < ilen; ++i) {
+	for (i = 0, ilen = scale.ticks.length; i < ilen; ++i) {
 		curr = scale.getPixelForTick(i);
 		min = i > 0 ? Math.min(min, Math.abs(curr - prev)) : min;
 		prev = curr;
diff --git a/src/scales/scale.category.js b/src/scales/scale.category.js
index eb0c7082d..5cd4cd96c 100644
--- a/src/scales/scale.category.js
+++ b/src/scales/scale.category.js
@@ -78,7 +78,7 @@ class CategoryScale extends Scale {
 		if (index < 0 || index > ticks.length - 1) {
 			return null;
 		}
-		return this.getPixelForValue(index * me._numLabels / ticks.length + this.min);
+		return me.getPixelForValue(index * me._numLabels / ticks.length + me.min);
 	}
 
 	getValueForPixel(pixel) {
diff --git a/src/scales/scale.linear.js b/src/scales/scale.linear.js
index a26db1332..321834991 100644
--- a/src/scales/scale.linear.js
+++ b/src/scales/scale.linear.js
@@ -63,11 +63,11 @@ class LinearScale extends LinearScaleBase {
 	}
 
 	getPixelForTick(index) {
-		var ticks = this._tickValues;
+		const ticks = this.ticks;
 		if (index < 0 || index > ticks.length - 1) {
 			return null;
 		}
-		return this.getPixelForValue(ticks[index]);
+		return this.getPixelForValue(ticks[index].value);
 	}
 }
 
diff --git a/src/scales/scale.linearbase.js b/src/scales/scale.linearbase.js
index 4423e346e..cf412ecc7 100644
--- a/src/scales/scale.linearbase.js
+++ b/src/scales/scale.linearbase.js
@@ -231,15 +231,9 @@ class LinearScaleBase extends Scale {
 		return ticks;
 	}
 
-	generateTickLabels(ticks) {
-		var me = this;
-		me._tickValues = ticks.map(t => t.value);
-		Scale.prototype.generateTickLabels.call(me, ticks);
-	}
-
 	_configure() {
 		var me = this;
-		var ticks = me.getTicks();
+		var ticks = me.ticks;
 		var start = me.min;
 		var end = me.max;
 		var offset;
diff --git a/src/scales/scale.radialLinear.js b/src/scales/scale.radialLinear.js
index f6fa1c8e3..944826a70 100644
--- a/src/scales/scale.radialLinear.js
+++ b/src/scales/scale.radialLinear.js
@@ -450,7 +450,7 @@ class RadialLinearScale extends LinearScaleBase {
 		if (gridLineOpts.display) {
 			me.ticks.forEach(function(tick, index) {
 				if (index !== 0) {
-					offset = me.getDistanceFromCenterForValue(me._tickValues[index]);
+					offset = me.getDistanceFromCenterForValue(me.ticks[index].value);
 					drawRadiusLine(me, gridLineOpts, offset, index);
 				}
 			});
@@ -508,7 +508,7 @@ class RadialLinearScale extends LinearScaleBase {
 				return;
 			}
 
-			offset = me.getDistanceFromCenterForValue(me._tickValues[index]);
+			offset = me.getDistanceFromCenterForValue(me.ticks[index].value);
 
 			if (tickOpts.showLabelBackdrop) {
 				width = ctx.measureText(tick.label).width;
diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js
index f1e553465..e2f74e056 100644
--- a/src/scales/scale.time.js
+++ b/src/scales/scale.time.js
@@ -703,10 +703,11 @@ class TimeScale extends Scale {
 	}
 
 	getPixelForTick(index) {
-		const ticks = this.getTicks();
-		return index >= 0 && index < ticks.length ?
-			this.getPixelForValue(ticks[index].value) :
-			null;
+		const ticks = this.ticks;
+		if (index < 0 || index > ticks.length - 1) {
+			return null;
+		}
+		return this.getPixelForValue(ticks[index].value);
 	}
 
 	getValueForPixel(pixel) {