Skip to content

Commit

Permalink
Faster date operations (#5982)
Browse files Browse the repository at this point in the history
  • Loading branch information
benmccann authored and simonbrunel committed Jan 17, 2019
1 parent 740e087 commit 69b4a4c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions src/adapters/adapter.moment.js
Expand Up @@ -41,15 +41,15 @@ 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) {
return moment(time).format(format);
},

add: function(time, amount, unit) {
return +moment(time).add(amount, unit);
return moment(time).add(amount, unit).valueOf();
},

diff: function(max, min, unit) {
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/scales/scale.time.js
Expand Up @@ -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);
Expand Down

0 comments on commit 69b4a4c

Please sign in to comment.