Address comments from code review

chartjs · May 11, 2019 · 729aa1e · 729aa1e
1 parent da0961c
commit 729aa1e
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js
@@ -408,9 +408,8 @@ function computeOffsets(table, ticks, min, max, options) {
 	return {start: start, end: end};
 }
 
-function ticksFromTimestamps(scale, values) {
+function ticksFromTimestamps(scale, values, majorUnit) {
 	var ticks = [];
-	var majorUnit = scale._majorUnit;
 	var i, ilen, value, major;
 
 	for (i = 0, ilen = values.length; i < ilen; ++i) {
@@ -642,7 +641,7 @@ module.exports = Scale.extend({
 			ticks.reverse();
 		}
 
-		return ticksFromTimestamps(me, ticks);
+		return ticksFromTimestamps(me, ticks, me._majorUnit);
 	},
 
 	getLabelForIndex: function(index, datasetIndex) {
@@ -677,11 +676,10 @@ module.exports = Scale.extend({
 		var minorFormat = formats[me._unit];
 		var majorUnit = me._majorUnit;
 		var majorFormat = formats[majorUnit];
-		var tick = !isNaN(index) && ticks[index];
-		var isMajorTime = tick && tick.major;
+		var tick = ticks[index];
 		var tickOpts = options.ticks;
 		var majorTickOpts = tickOpts.major;
-		var major = majorTickOpts.enabled && majorUnit && majorFormat && isMajorTime;
+		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([
@@ -782,7 +780,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, ticksFromTimestamps(me, [exampleTime]), format);
+		var exampleLabel = me.tickFormatFunction(exampleTime, 0, ticksFromTimestamps(me, [exampleTime], me._majorUnit), format);
 		var tickLabelWidth = me.getLabelWidth(exampleLabel);
 
 		// Using margins instead of padding because padding is not calculated