aboutsummaryrefslogtreecommitdiffstats
path: root/bower_components/moment/src/lib/units/offset.js
diff options
context:
space:
mode:
Diffstat (limited to 'bower_components/moment/src/lib/units/offset.js')
-rw-r--r--bower_components/moment/src/lib/units/offset.js31
1 files changed, 19 insertions, 12 deletions
diff --git a/bower_components/moment/src/lib/units/offset.js b/bower_components/moment/src/lib/units/offset.js
index 75aeb02..33288c0 100644
--- a/bower_components/moment/src/lib/units/offset.js
+++ b/bower_components/moment/src/lib/units/offset.js
@@ -1,11 +1,12 @@
import zeroFill from '../utils/zero-fill';
import { createDuration } from '../duration/create';
import { addSubtract } from '../moment/add-subtract';
-import { isMoment } from '../moment/constructor';
+import { isMoment, copyConfig } from '../moment/constructor';
import { addFormatToken } from '../format/format';
import { addRegexToken, matchOffset } from '../parse/regex';
import { addParseToken } from '../parse/token';
import { createLocal } from '../create/local';
+import { prepareConfig } from '../create/from-anything';
import { createUTC } from '../create/utc';
import isDate from '../utils/is-date';
import toInt from '../utils/to-int';
@@ -67,7 +68,6 @@ export function cloneWithOffset(input, model) {
} else {
return createLocal(input).local();
}
- return model._isUTC ? createLocal(input).zone(model._offset || 0) : createLocal(input).local();
}
function getDateOffset (m) {
@@ -167,12 +167,7 @@ export function setOffsetToParsedOffset () {
}
export function hasAlignedHourOffset (input) {
- if (!input) {
- input = 0;
- }
- else {
- input = createLocal(input).utcOffset();
- }
+ input = input ? createLocal(input).utcOffset() : 0;
return (this.utcOffset() - input) % 60 === 0;
}
@@ -185,12 +180,24 @@ export function isDaylightSavingTime () {
}
export function isDaylightSavingTimeShifted () {
- if (this._a) {
- var other = this._isUTC ? createUTC(this._a) : createLocal(this._a);
- return this.isValid() && compareArrays(this._a, other.toArray()) > 0;
+ if (typeof this._isDSTShifted !== 'undefined') {
+ return this._isDSTShifted;
+ }
+
+ var c = {};
+
+ copyConfig(c, this);
+ c = prepareConfig(c);
+
+ if (c._a) {
+ var other = c._isUTC ? createUTC(c._a) : createLocal(c._a);
+ this._isDSTShifted = this.isValid() &&
+ compareArrays(c._a, other.toArray()) > 0;
+ } else {
+ this._isDSTShifted = false;
}
- return false;
+ return this._isDSTShifted;
}
export function isLocal () {