From 0bb2e478db7ad108591dd1fa51636797ded5d022 Mon Sep 17 00:00:00 2001 From: Evert Timberg Date: Sat, 30 Jul 2016 11:06:13 -0400 Subject: [PATCH 1/2] Recalculate the size of the scale in units when the end point is changed. --- src/scales/scale.time.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js index 91ac3aa0778..8d591b30512 100755 --- 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; From b86e42f2aedd1ef2a7a4ff9c99ba54f1163d75b0 Mon Sep 17 00:00:00 2001 From: Evert Timberg Date: Sat, 30 Jul 2016 11:33:59 -0400 Subject: [PATCH 2/2] Fix JS Hint warning --- src/scales/scale.time.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js index 8d591b30512..4e668cb67f2 100755 --- a/src/scales/scale.time.js +++ b/src/scales/scale.time.js @@ -252,7 +252,7 @@ module.exports = function(Chart) { me.lastTick = roundedEnd; } - me.scaleSizeInUnits = me.lastTick.diff(me.firstTick, me.tickUnit, true) + me.scaleSizeInUnits = me.lastTick.diff(me.firstTick, me.tickUnit, true); } me.smallestLabelSeparation = me.width;