From: Mattias Lyckne <mattias@lyckne.se>
Date: Mon, 21 Dec 2015 12:59:29 +0000 (+0100)
Subject: Dont set autoSkip false if userCallback is defined
X-Git-Tag: 2.0.0-beta2~12^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7363c6fcbe41c59386118d5b005de65d66fc1a13;p=thirdparty%2FChart.js.git

Dont set autoSkip false if userCallback is defined

”The reason being is that the user could replace either callback or
userCallbac”
---

diff --git a/src/core/core.scale.js b/src/core/core.scale.js
index aa8b79d3e..42845ebd4 100644
--- a/src/core/core.scale.js
+++ b/src/core/core.scale.js
@@ -406,10 +406,6 @@
 				var scaleLabelY;
 				var useAutoskipper = this.options.ticks.autoSkip;
 
-				if(this.options.ticks.userCallback) {
-					useAutoskipper = false;
-				}
-
 				// Make sure we draw text in the correct color and font
 				this.ctx.fillStyle = this.options.ticks.fontColor;
 				var labelFont = helpers.fontString(this.options.ticks.fontSize, this.options.ticks.fontStyle, this.options.ticks.fontFamily);