Use tick.major rather than recomputing (#6265)

diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js
index 849dd8dcc6e31eacd6181498be0e8ff9985c3848..b00daa2403e674c3dd1d8d71da2480517b445450 100644 (file)
--- a/src/scales/scale.time.js
+++ b/src/scales/scale.time.js
@@ -672,10 +672,10 @@ module.exports = Scale.extend({
                var minorFormat = formats[me._unit];
                var majorUnit = me._majorUnit;
                var majorFormat = formats[majorUnit];
-               var majorTime = +adapter.startOf(time, majorUnit);
+               var tick = ticks[index];
                var tickOpts = options.ticks;
                var majorTickOpts = tickOpts.major;
-               var major = majorTickOpts.enabled && majorUnit && majorFormat && time === majorTime;
+               var major = majorTickOpts.enabled && majorUnit && majorFormat && tick && tick.major;
                var label = adapter.format(time, format ? format : major ? majorFormat : minorFormat);
                var nestedTickOpts = major ? majorTickOpts : tickOpts.minor;
                var formatter = helpers.options.resolve([
@@ -785,7 +785,7 @@ module.exports = Scale.extend({
 
                // pick the longest format (milliseconds) for guestimation
                var format = displayFormats[timeOpts.unit] || displayFormats.millisecond;
-               var exampleLabel = me.tickFormatFunction(exampleTime, 0, [], format);
+               var exampleLabel = me.tickFormatFunction(exampleTime, 0, ticksFromTimestamps(me, [exampleTime], me._majorUnit), format);
                var size = me._getLabelSize(exampleLabel);
 
                // Using margins instead of padding because padding is not calculated