From: Evert Timberg <evert.timberg@gmail.com>
Date: Mon, 15 Feb 2016 14:41:35 +0000 (-0500)
Subject: Disable autoskipper for time scales
X-Git-Tag: v2.0.0~40^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2015%2Fhead;p=thirdparty%2FChart.js.git

Disable autoskipper for time scales
---

diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js
index 129cdf58c..629d41256 100644
--- a/src/scales/scale.time.js
+++ b/src/scales/scale.time.js
@@ -65,6 +65,9 @@ module.exports = function(Chart) {
 				'quarter': '[Q]Q - YYYY', // Q3
 				'year': 'YYYY' // 2015
 			}
+		},
+		ticks: {
+			autoSkip: false,
 		}
 	};
 
diff --git a/test/scale.time.tests.js b/test/scale.time.tests.js
index 777e63ce9..502329563 100644
--- a/test/scale.time.tests.js
+++ b/test/scale.time.tests.js
@@ -46,7 +46,7 @@ describe('Time scale tests', function() {
 				reverse: false,
 				display: true,
 				callback: defaultConfig.ticks.callback, // make this nicer, then check explicitly below,
-				autoSkip: true,
+				autoSkip: false,
 				autoSkipPadding: 20
 			},
 			time: {