archive-gh-me/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2026-01-25 16:42:06 +00:00
Code Issues Projects Releases Wiki Activity

Fix handling of null labels (#4795)

Browse Source
This commit is contained in:
Ben McCann 2017-09-29 04:52:33 -07:00 committed by Evert Timberg
parent b94532c29f
commit b4d69247b0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/core.scale.js
View 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;
}