Merge pull request moment#2054 from elad:develop

Call updateOffset when creating moment
claireksnyk · Dec 28, 2014 · ef27605 · ef27605
2 parents 74fd41e + bbf4271
commit ef27605
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/moment.js b/moment.js
@@ -285,7 +285,9 @@
 
  deprecations = {},
 
- lists = ['months', 'monthsShort', 'weekdays', 'weekdaysShort', 'weekdaysMin'];
+ lists = ['months', 'monthsShort', 'weekdays', 'weekdaysShort', 'weekdaysMin'],
+
+ updateInProgress = false;
 
  // Pick the first defined of two or three arguments. dfl comes from
  // default.
@@ -404,6 +406,13 @@
  }
  copyConfig(this, config);
  this._d = new Date(+config._d);
+ // Prevent infinite loop in case updateOffset creates new moment
+ // objects.
+ if (updateInProgress === false) {
+ updateInProgress = true;
+ moment.updateOffset(this);
+ updateInProgress = false;
+ }
  }
 
  // Duration Constructor