From: etimberg <evert.timberg@gmail.com>
Date: Wed, 2 Dec 2015 02:07:53 +0000 (-0500)
Subject: Fix test failures
X-Git-Tag: 2.0.0-beta2~37^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=refs%2Fpull%2F1724%2Fhead;p=thirdparty%2FChart.js.git

Fix test failures
---

diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js
index 2f562bb79..f1a311836 100644
--- a/src/scales/scale.time.js
+++ b/src/scales/scale.time.js
@@ -133,6 +133,7 @@
 
 			this.ticks = [];
 			this.labelMoments = [];
+			this.unitScale = 1; // How much we scale the unit by, ie 2 means 2x unit per step 
 
 			this.buildLabelMoments();
 
@@ -152,8 +153,6 @@
 				this.tickRange = Math.ceil(this.lastTick.diff(this.firstTick, this.tickUnit, true) + buffer);
 				this.displayFormat = this.options.time.displayFormats[this.tickUnit];
 
-				// How much we scale the unit by, ie 2 means 2x unit per step 
-				this.unitScale = 1;
 				var unitDefinitionIndex = 0;
 				var unitDefinition = time.units[unitDefinitionIndex];