Skip to content

Commit dbd835f

Browse files
kurkleetimberg
authored andcommitted
Use ticks consistently (#6873)
1 parent 1cda969 commit dbd835f

File tree

6 files changed

+12
-17
lines changed

6 files changed

+12
-17
lines changed

src/controllers/controller.bar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function computeMinSampleSize(scale, pixels) {
5353
min = Math.min(min, Math.abs(pixels[i] - pixels[i - 1]));
5454
}
5555

56-
for (i = 0, ilen = scale.getTicks().length; i < ilen; ++i) {
56+
for (i = 0, ilen = scale.ticks.length; i < ilen; ++i) {
5757
curr = scale.getPixelForTick(i);
5858
min = i > 0 ? Math.min(min, Math.abs(curr - prev)) : min;
5959
prev = curr;

src/scales/scale.category.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class CategoryScale extends Scale {
7878
if (index < 0 || index > ticks.length - 1) {
7979
return null;
8080
}
81-
return this.getPixelForValue(index * me._numLabels / ticks.length + this.min);
81+
return me.getPixelForValue(index * me._numLabels / ticks.length + me.min);
8282
}
8383

8484
getValueForPixel(pixel) {

src/scales/scale.linear.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ class LinearScale extends LinearScaleBase {
6363
}
6464

6565
getPixelForTick(index) {
66-
var ticks = this._tickValues;
66+
const ticks = this.ticks;
6767
if (index < 0 || index > ticks.length - 1) {
6868
return null;
6969
}
70-
return this.getPixelForValue(ticks[index]);
70+
return this.getPixelForValue(ticks[index].value);
7171
}
7272
}
7373

src/scales/scale.linearbase.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -231,15 +231,9 @@ class LinearScaleBase extends Scale {
231231
return ticks;
232232
}
233233

234-
generateTickLabels(ticks) {
235-
var me = this;
236-
me._tickValues = ticks.map(t => t.value);
237-
Scale.prototype.generateTickLabels.call(me, ticks);
238-
}
239-
240234
_configure() {
241235
var me = this;
242-
var ticks = me.getTicks();
236+
var ticks = me.ticks;
243237
var start = me.min;
244238
var end = me.max;
245239
var offset;

src/scales/scale.radialLinear.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ class RadialLinearScale extends LinearScaleBase {
450450
if (gridLineOpts.display) {
451451
me.ticks.forEach(function(tick, index) {
452452
if (index !== 0) {
453-
offset = me.getDistanceFromCenterForValue(me._tickValues[index]);
453+
offset = me.getDistanceFromCenterForValue(me.ticks[index].value);
454454
drawRadiusLine(me, gridLineOpts, offset, index);
455455
}
456456
});
@@ -508,7 +508,7 @@ class RadialLinearScale extends LinearScaleBase {
508508
return;
509509
}
510510

511-
offset = me.getDistanceFromCenterForValue(me._tickValues[index]);
511+
offset = me.getDistanceFromCenterForValue(me.ticks[index].value);
512512

513513
if (tickOpts.showLabelBackdrop) {
514514
width = ctx.measureText(tick.label).width;

src/scales/scale.time.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -703,10 +703,11 @@ class TimeScale extends Scale {
703703
}
704704

705705
getPixelForTick(index) {
706-
const ticks = this.getTicks();
707-
return index >= 0 && index < ticks.length ?
708-
this.getPixelForValue(ticks[index].value) :
709-
null;
706+
const ticks = this.ticks;
707+
if (index < 0 || index > ticks.length - 1) {
708+
return null;
709+
}
710+
return this.getPixelForValue(ticks[index].value);
710711
}
711712

712713
getValueForPixel(pixel) {

0 commit comments

Comments
 (0)