Mirrors/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2024-10-06 04:09:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix autoskipped ticks messing up category axis (#4649)

Browse Source
This commit is contained in:
andig 2017-08-19 15:03:11 +02:00 committed by Evert Timberg
parent b9afeaf973
commit 0e5ce3f4e7
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/core.scale.js
View File

@ -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);
}
@ -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)) {