Merge pull request #2015 from nnnick/fix/1962

Disable autoskipper for time scales
This commit is contained in:
Evert Timberg 2016-02-15 09:44:53 -05:00
commit 2672efad63
2 changed files with 4 additions and 1 deletions

View File

@ -65,6 +65,9 @@ module.exports = function(Chart) {
'quarter': '[Q]Q - YYYY', // Q3
'year': 'YYYY' // 2015
}
},
ticks: {
autoSkip: false,
}
};

View File

@ -46,7 +46,7 @@ describe('Time scale tests', function() {
reverse: false,
display: true,
callback: defaultConfig.ticks.callback, // make this nicer, then check explicitly below,
autoSkip: true,
autoSkip: false,
autoSkipPadding: 20
},
time: {