Skip to content

Commit 729aa1e

Browse files
committed
Address comments from code review
1 parent da0961c commit 729aa1e

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

src/scales/scale.time.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -408,9 +408,8 @@ function computeOffsets(table, ticks, min, max, options) {
408408
return {start: start, end: end};
409409
}
410410

411-
function ticksFromTimestamps(scale, values) {
411+
function ticksFromTimestamps(scale, values, majorUnit) {
412412
var ticks = [];
413-
var majorUnit = scale._majorUnit;
414413
var i, ilen, value, major;
415414

416415
for (i = 0, ilen = values.length; i < ilen; ++i) {
@@ -642,7 +641,7 @@ module.exports = Scale.extend({
642641
ticks.reverse();
643642
}
644643

645-
return ticksFromTimestamps(me, ticks);
644+
return ticksFromTimestamps(me, ticks, me._majorUnit);
646645
},
647646

648647
getLabelForIndex: function(index, datasetIndex) {
@@ -677,11 +676,10 @@ module.exports = Scale.extend({
677676
var minorFormat = formats[me._unit];
678677
var majorUnit = me._majorUnit;
679678
var majorFormat = formats[majorUnit];
680-
var tick = !isNaN(index) && ticks[index];
681-
var isMajorTime = tick && tick.major;
679+
var tick = ticks[index];
682680
var tickOpts = options.ticks;
683681
var majorTickOpts = tickOpts.major;
684-
var major = majorTickOpts.enabled && majorUnit && majorFormat && isMajorTime;
682+
var major = majorTickOpts.enabled && majorUnit && majorFormat && tick && tick.major;
685683
var label = adapter.format(time, format ? format : major ? majorFormat : minorFormat);
686684
var nestedTickOpts = major ? majorTickOpts : tickOpts.minor;
687685
var formatter = helpers.options.resolve([
@@ -782,7 +780,7 @@ module.exports = Scale.extend({
782780
// pick the longest format (milliseconds) for guestimation
783781
var format = displayFormats[timeOpts.unit] || displayFormats.millisecond;
784782

785-
var exampleLabel = me.tickFormatFunction(exampleTime, 0, ticksFromTimestamps(me, [exampleTime]), format);
783+
var exampleLabel = me.tickFormatFunction(exampleTime, 0, ticksFromTimestamps(me, [exampleTime], me._majorUnit), format);
786784
var tickLabelWidth = me.getLabelWidth(exampleLabel);
787785

788786
// Using margins instead of padding because padding is not calculated

0 commit comments

Comments
 (0)