]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Recalculate the size of the scale in units when the end point is changed.
authorEvert Timberg <evert.timberg+github@gmail.com>
Sat, 30 Jul 2016 15:06:13 +0000 (11:06 -0400)
committerEvert Timberg <evert.timberg+github@gmail.com>
Sat, 30 Jul 2016 15:06:13 +0000 (11:06 -0400)
src/scales/scale.time.js

index 91ac3aa0778c57a8211231fe1d3f87dbbf478225..8d591b305127680183c330300ec137115a724749 100755 (executable)
@@ -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;