Skip to content

Commit

Permalink
Fix autoskipped ticks messing up category axis (#4649)
Browse files Browse the repository at this point in the history
  • Loading branch information
andig authored and etimberg committed Aug 19, 2017
1 parent b9afeaf commit 0e5ce3f
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/core/core.scale.js
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,8 @@ 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)) {
continue;
// leave tick in place but make sure it's not displayed (#4635)
delete tick.label;
}
result.push(tick);
}
Expand Down Expand Up @@ -672,6 +673,11 @@ module.exports = function(Chart) {
var yTickEnd = options.position === 'bottom' ? me.top + tl : me.bottom;

helpers.each(ticks, function(tick, index) {
// autoskipper skipped this tick (#4635)
if (tick.label === undefined) {
return;
}

var label = tick.label;
var lineWidth, lineColor, borderDash, borderDashOffset;
if (index === (typeof me.zeroLineIndex !== 'undefined' ? me.zeroLineIndex : 0) && (options.offset === gridLines.offsetGridLines)) {
Expand Down

0 comments on commit 0e5ce3f

Please sign in to comment.