]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Fix handling of null labels (#4795)
authorBen McCann <benjamin.j.mccann@gmail.com>
Fri, 29 Sep 2017 11:52:33 +0000 (04:52 -0700)
committerEvert Timberg <evert.timberg+github@gmail.com>
Fri, 29 Sep 2017 11:52:33 +0000 (13:52 +0200)
src/core/core.scale.js

index 89df4304b5b2d8c7735c707f38beb5b80a135efe..ffe13cbff8248150b9299bcb3ab7f75d7dbfe34e 100644 (file)
@@ -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;
                                }