Merge pull request #1866 from morleyzhi/v2.0-dev

Fix a bug where ticks get culled when they don't need to be (fixes #1865)
This commit is contained in:
Evert Timberg
2016-01-07 16:21:49 -05:00
3 changed files with 3 additions and 3 deletions

2
Chart.js vendored
View File

@@ -2928,7 +2928,7 @@
// if they defined a max number of ticks,
// increase skipRatio until that number is met
if (maxTicks) {
if (maxTicks && this.ticks.length > maxTicks) {
while (!skipRatio || this.ticks.length / (skipRatio || 1) > maxTicks) {
if (!skipRatio) {
skipRatio = 1;

2
Chart.min.js vendored

File diff suppressed because one or more lines are too long

View File

@@ -465,7 +465,7 @@
// if they defined a max number of ticks,
// increase skipRatio until that number is met
if (maxTicks) {
if (maxTicks && this.ticks.length > maxTicks) {
while (!skipRatio || this.ticks.length / (skipRatio || 1) > maxTicks) {
if (!skipRatio) {
skipRatio = 1;