From: Ben McCann <benjamin.j.mccann@gmail.com>
Date: Fri, 29 Sep 2017 11:52:33 +0000 (-0700)
Subject: Fix handling of null labels (#4795)
X-Git-Tag: v2.7.1~1^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4d69247b055e25c87bf67019112495c5fa982db;p=thirdparty%2FChart.js.git

Fix handling of null labels (#4795)
---

diff --git a/src/core/core.scale.js b/src/core/core.scale.js
index 89df4304b..ffe13cbff 100644
--- a/src/core/core.scale.js
+++ b/src/core/core.scale.js
@@ -662,7 +662,7 @@ module.exports = function(Chart) {
 
 				// Since we always show the last tick,we need may need to hide the last shown one before
 				shouldSkip = (skipRatio > 1 && i % skipRatio > 0) || (i % skipRatio === 0 && i + skipRatio >= tickCount);
-				if (shouldSkip && i !== tickCount - 1 || helpers.isNullOrUndef(tick.label)) {
+				if (shouldSkip && i !== tickCount - 1) {
 					// leave tick in place but make sure it's not displayed (#4635)
 					delete tick.label;
 				}
@@ -712,7 +712,7 @@ module.exports = function(Chart) {
 
 			helpers.each(ticks, function(tick, index) {
 				// autoskipper skipped this tick (#4635)
-				if (tick.label === undefined) {
+				if (helpers.isNullOrUndef(tick.label)) {
 					return;
 				}