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

Merge pull request #2017 from nnnick/fix/1884

Browse Source 
When the last label would overlap with the previously shown label, skip the previously shown one
This commit is contained in:
Evert Timberg 2016-02-15 10:49:59 -05:00
commit c3149a9400
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -484,7 +484,9 @@ module.exports = function(Chart) {
helpers.each(this.ticks, function(label, index) { helpers.each(this.ticks, function(label, index) {
// Blank ticks // Blank ticks
var isLastTick = this.ticks.length === index + 1; var isLastTick = this.ticks.length === index + 1;
var shouldSkip = skipRatio > 1 && index % skipRatio > 0;
// Since we always show the last tick,we need may need to hide the last shown one before
var shouldSkip = (skipRatio > 1 && index % skipRatio > 0) || (index % skipRatio === 0 && index + skipRatio > this.ticks.length);
if (shouldSkip && !isLastTick || (label === undefined || label === null)) { if (shouldSkip && !isLastTick || (label === undefined || label === null)) {
return; return;
} }