From dfe9c4053a6ee7601223a08ef922db46794f74a1 Mon Sep 17 00:00:00 2001
From: Ivo Silva <knokit@gmail.com>
Date: Sat, 14 Oct 2017 15:53:01 +0200
Subject: [PATCH] Fix for majorLabels showing wrong dates (#3573)

---
 lib/timeline/TimeStep.js           |  2 +-
 lib/timeline/component/TimeAxis.js | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/lib/timeline/TimeStep.js b/lib/timeline/TimeStep.js
index 9cb5e07c..f72fd1c0 100644
--- a/lib/timeline/TimeStep.js
+++ b/lib/timeline/TimeStep.js
@@ -279,7 +279,7 @@ TimeStep.prototype.next = function() {
  * @return {Moment}  current The current date
  */
 TimeStep.prototype.getCurrent = function() {
-  return this.current;
+  return this.current.clone();
 };
 
 /**
diff --git a/lib/timeline/component/TimeAxis.js b/lib/timeline/component/TimeAxis.js
index 5f02e3e2..c67bca5b 100644
--- a/lib/timeline/component/TimeAxis.js
+++ b/lib/timeline/component/TimeAxis.js
@@ -222,16 +222,14 @@ TimeAxis.prototype._repaintLabels = function () {
   dom.majorTexts = [];
   dom.minorTexts = [];
 
-  var current;  // eslint-disable-line no-unused-vars
+  var current;
   var next;
   var x;
   var xNext;
   var isMajor;
-  var nextIsMajor;  // eslint-disable-line no-unused-vars
   var showMinorGrid;
   var width = 0, prevWidth;
   var line;
-  var labelMinor;
   var xFirstMajorLabel = undefined;
   var count = 0;
   const MAX = 1000;
@@ -245,14 +243,12 @@ TimeAxis.prototype._repaintLabels = function () {
 
     isMajor = step.isMajor();
     className = step.getClassName();
-    labelMinor = step.getLabelMinor();
 
     current = next;
     x = xNext;
 
     step.next();
     next = step.getCurrent();
-    nextIsMajor = step.isMajor();
     xNext = this.body.util.toScreen(next);
 
     prevWidth = width;
@@ -263,7 +259,7 @@ TimeAxis.prototype._repaintLabels = function () {
     }
 
     if (this.options.showMinorLabels && showMinorGrid) {
-      var label = this._repaintMinorText(x, labelMinor, orientation, className);
+      var label = this._repaintMinorText(x, step.getLabelMinor(current), orientation, className);
       label.style.width = width + 'px'; // set width to prevent overflow
     }
 
@@ -272,7 +268,7 @@ TimeAxis.prototype._repaintLabels = function () {
         if (xFirstMajorLabel == undefined) {
           xFirstMajorLabel = x;
         }
-        label = this._repaintMajorText(x, step.getLabelMajor(), orientation, className);
+        label = this._repaintMajorText(x, step.getLabelMajor(current), orientation, className);
       }
       line = this._repaintMajorLine(x, width, orientation, className);
     }
@@ -427,7 +423,7 @@ TimeAxis.prototype._repaintMinorLine = function (x, width, orientation, classNam
   }
   line.style.width = width + 'px';
 
-  
+
 
   return line;
 };