From: etimberg <evert.timberg@gmail.com>
Date: Sun, 4 Dec 2016 03:21:25 +0000 (-0500)
Subject: Fix newly introduced drawing bug when tick marks are not drawn
X-Git-Tag: v2.5.0~1^2~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75d15ff98b859dacc59520ba6943c99b00bd2ab6;p=thirdparty%2FChart.js.git

Fix newly introduced drawing bug when tick marks are not drawn
---

diff --git a/src/core/core.scale.js b/src/core/core.scale.js
index 1cc434f63..57aefd1da 100644
--- a/src/core/core.scale.js
+++ b/src/core/core.scale.js
@@ -494,7 +494,7 @@ module.exports = function(Chart) {
 			var tickFontColor = helpers.getValueOrDefault(optionTicks.fontColor, globalDefaults.defaultFontColor);
 			var tickFont = parseFontOptions(optionTicks);
 
-			var tl = gridLines.tickMarkLength;
+			var tl = gridLines.drawTicks ? gridLines.tickMarkLength : 0;
 			var borderDash = helpers.getValueOrDefault(gridLines.borderDash, globalDefaults.borderDash);
 			var borderDashOffset = helpers.getValueOrDefault(gridLines.borderDashOffset, globalDefaults.borderDashOffset);