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

Faster date operations (#5982)

Browse Source
This commit is contained in:
Ben McCann 2019-01-17 07:01:27 -08:00 committed by Simon Brunel
parent 740e0874a4
commit 69b4a4c003
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/adapters/adapter.moment.js
View File

@ -41,7 +41,7 @@ helpers.merge(adapter, moment ? {
} else if (!(value instanceof moment)) {
value = moment(value);
}
return value.isValid() ? +value : null;
return value.isValid() ? value.valueOf() : null;
},
format: function(time, format) {
@ -49,7 +49,7 @@ helpers.merge(adapter, moment ? {
},
add: function(time, amount, unit) {
return +moment(time).add(amount, unit);
return moment(time).add(amount, unit).valueOf();
},
diff: function(max, min, unit) {
@ -59,13 +59,13 @@ helpers.merge(adapter, moment ? {
startOf: function(time, unit, weekday) {
time = moment(time);
if (unit === 'isoWeek') {
return +time.isoWeekday(weekday);
return time.isoWeekday(weekday).valueOf();
}
return +time.startOf(unit);
return time.startOf(unit).valueOf();
},
endOf: function(time, unit) {
return +moment(time).endOf(unit);
return moment(time).endOf(unit).valueOf();
},
// DEPRECATIONS

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

@ -574,8 +574,8 @@ module.exports = Scale.extend({
max = parse(timeOpts.max, me) || max;
// In case there is no valid min/max, set limits based on unit time option
min = min === MAX_INTEGER ? +adapter.startOf(+new Date(), unit) : min;
max = max === MIN_INTEGER ? +adapter.endOf(+new Date(), unit) + 1 : max;
min = min === MAX_INTEGER ? +adapter.startOf(Date.now(), unit) : min;
max = max === MIN_INTEGER ? +adapter.endOf(Date.now(), unit) + 1 : max;
// Make sure that max is strictly higher than min (required by the lookup table)
me.min = Math.min(min, max);