From: Evert Timberg <evert.timberg@gmail.com>
Date: Thu, 12 Nov 2015 02:40:29 +0000 (-0500)
Subject: Bail out, same as the x axis
X-Git-Tag: 2.0.0-beta1~21^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14b6fdd51eaac14671b1cbd17f69f6cda846557e;p=thirdparty%2FChart.js.git

Bail out, same as the x axis
---

diff --git a/src/core/core.scale.js b/src/core/core.scale.js
index edf807de0..f40f6fa2d 100644
--- a/src/core/core.scale.js
+++ b/src/core/core.scale.js
@@ -467,6 +467,11 @@
 					var xTickEnd = this.options.position == "right" ? this.left + 5 : this.right;
 
 					helpers.each(this.ticks, function(label, index) {
+						// If the callback returned a null or undefined value, do not draw this line
+						if (label === undefined || label === null) {
+							return;
+						}
+
 						var yLineValue = this.getPixelForTick(index); // xvalues for grid lines
 
 						if (this.options.gridLines.show) {