Use ticks consistently (#6873)

diff --git a/src/controllers/controller.bar.js b/src/controllers/controller.bar.js
index 7755cd14ff7ab7f3d76f425f2d391cd7335347f3..5f7054fbcef046a61aefd15890190634137d998d 100644 (file)
--- 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 eb0c7082d5f6f4099b72b5200728005a3dfe5621..5cd4cd96c1d489444a4d13bc8dea45accba0f4f2 100644 (file)
--- 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 a26db1332f8db97802fb24d40212f5f599055b66..32183499113bbcb773bc5acac6782c363339f0f2 100644 (file)
--- 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 4423e346e50b31e312a7efd980653563a9484065..cf412ecc7bac963a5a2c6840ab01c8fa3c82ea22 100644 (file)
--- 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 f6fa1c8e3803e1dc4c32a45d38b376ee7d5a5e39..944826a7022e33cb1c7b62686848e722845f83a6 100644 (file)
--- 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 f1e553465b00d794083513bdd647139678f5ca48..e2f74e056651c2d8b1c9e81bfd5982c7f1a99ac3 100644 (file)
--- 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) {