Merge pull request #3064 from chartjs/fix/2560

Recalculate the size of the scale in units when the end point is chan…
chartjs · Jul 30, 2016 · cec8d8b · cec8d8b
2 parents 1731620 + b86e42f
commit cec8d8b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js
@@ -244,10 +244,15 @@ module.exports = function(Chart) {
 			// Only round the last tick if we have no hard maximum
 			if (!me.options.time.max) {
 				var roundedEnd = me.getMomentStartOf(me.lastTick);
-				if (roundedEnd.diff(me.lastTick, me.tickUnit, true) !== 0) {
+				var delta = roundedEnd.diff(me.lastTick, me.tickUnit, true);
+				if (delta < 0) {
 					// Do not use end of because we need me to be in the next time unit
 					me.lastTick = me.getMomentStartOf(me.lastTick.add(1, me.tickUnit));
+				} else if (delta >= 0) {
+					me.lastTick = roundedEnd;
 				}
+
+				me.scaleSizeInUnits = me.lastTick.diff(me.firstTick, me.tickUnit, true);
 			}
 
 			me.smallestLabelSeparation = me.width;