From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Tue, 14 May 2019 06:29:41 +0000 (-0700)
Subject: Use tick.major rather than recomputing (#6265)
X-Git-Tag: v2.9.0~1^2~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=196274defcd206c7581bd20dd005f650aa63c4f5;p=thirdparty%2FChart.js.git

Use tick.major rather than recomputing (#6265)
---

diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js
index 849dd8dcc..b00daa240 100644
--- 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