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

Remove extra call to _getLabelCapacity (#6999)

Browse Source
This commit is contained in:
Ben McCann 2020-02-01 05:24:23 -08:00 committed by GitHub
parent 26536f8849
commit 251f3832bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/scales/scale.time.js
View File

@ -230,11 +230,13 @@ function determineMajorUnit(unit) {
* Important: this method can return ticks outside the min and max range, it's the
* responsibility of the calling code to clamp values if needed.
*/
function generate(scale, min, max, capacity) {
function generate(scale) {
const adapter = scale._adapter;
const min = scale.min;
const max = scale.max;
const options = scale.options;
const timeOpts = options.time;
const minor = timeOpts.unit || determineUnitForAutoTicks(timeOpts.minUnit, min, max, capacity);
const minor = timeOpts.unit || determineUnitForAutoTicks(timeOpts.minUnit, min, max, scale._getLabelCapacity(min));
const stepSize = resolve([timeOpts.stepSize, timeOpts.unitStepSize, 1]);
const weekday = minor === 'week' ? timeOpts.isoWeekday : false;
const ticks = [];
@ -396,22 +398,15 @@ function getAllTimestamps(scale) {
function getTimestampsForTicks(scale) {
const min = scale.min;
const max = scale.max;
const options = scale.options;
const capacity = scale._getLabelCapacity(min);
const source = options.ticks.source;
let timestamps;
if (source === 'data' || (source === 'auto' && options.distribution === 'series')) {
timestamps = getAllTimestamps(scale);
return getAllTimestamps(scale);
} else if (source === 'labels') {
timestamps = getLabelTimestamps(scale);
} else {
timestamps = generate(scale, min, max, capacity, options);
return getLabelTimestamps(scale);
}
return timestamps;
return generate(scale);
}
function getTimestampsForTable(scale) {