Version 0.2.1

sparsh0611 · Aug 3, 2014 · 745e3bb · 745e3bb
1 parent 824dfdc
commit 745e3bb
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 22 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "moment-timezone",
   "description" : "Parse and display moments in any timezone.",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "main": "builds/moment-timezone-with-data-2010-2020.js",
   "dependencies" : {
     "moment" : ">= 2.6.0"

diff --git a/builds/moment-timezone-with-data-2010-2020.js b/builds/moment-timezone-with-data-2010-2020.js
@@ -1,5 +1,5 @@
 //! moment-timezone.js
-//! version : 0.2.0
+//! version : 0.2.1
 //! author : Tim Wood
 //! license : MIT
 //! github.com/moment/moment-timezone
@@ -21,7 +21,7 @@
 	// Do not load moment-timezone a second time.
 	if (moment.tz !== undefined) { return moment; }
 
-	var VERSION = "0.2.0",
+	var VERSION = "0.2.1",
 		zones = {},
 		links = {};
 
@@ -302,7 +302,7 @@
 			out  = moment.utc.apply(null, args);
 
 		if (zone && needsOffset(out)) {
-			out.add('minutes', zone.parse(out));
+			out.add(zone.parse(out), 'minutes');
 		}
 
 		out.tz(name);
@@ -369,7 +369,7 @@
 	function resetZoneWrap (old) {
 		return function () {
 			this._z = null;
-			return old.call(this);
+			return old.apply(this, arguments);
 		};
 	}
 
@@ -378,7 +378,15 @@
 	fn.utc      = resetZoneWrap(fn.utc);
 
 	// Cloning a moment should include the _z property.
-	moment.momentProperties._z = null;
+	var momentProperties = moment.momentProperties;
+	if (Object.prototype.toString.call(momentProperties) === '[object Array]') {
+		// moment 2.8.1+
+		momentProperties.push('_z');
+		momentProperties.push('_a');
+	} else {
+		// moment 2.7.0
+		momentProperties._z = null;
+	}
 
 	loadData({
 		"version": "2014e",

diff --git a/builds/moment-timezone-with-data-2010-2020.min.js b/builds/moment-timezone-with-data-2010-2020.min.js
diff --git a/builds/moment-timezone-with-data.js b/builds/moment-timezone-with-data.js
diff --git a/builds/moment-timezone-with-data.min.js b/builds/moment-timezone-with-data.min.js
diff --git a/builds/moment-timezone.min.js b/builds/moment-timezone.min.js
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,6 @@
+### `0.2.1` _2014-08-02_
+* Fixed support for `moment@2.8.1+`.
+
 ### `0.2.0` _2014-07-21_
 * Added the ability to configure whether ambiguous or invalid input is rolled forward or backward. [#101](https://github.com/moment/moment-timezone/pull/101)
 * Added `moment>=2.6.0` as a dependency in `bower.json`. [#107](https://github.com/moment/moment-timezone/issues/107)
@@ -44,4 +47,4 @@
 * Added more links and timezone names in moment-timezone.json
 
 ### `0.0.1` _2013-07-17_
-* Initial version.
+* Initial version.
diff --git a/moment-timezone-utils.js b/moment-timezone-utils.js
@@ -1,5 +1,5 @@
 //! moment-timezone-utils.js
-//! version : 0.2.0
+//! version : 0.2.1
 //! author : Tim Wood
 //! license : MIT
 //! github.com/moment/moment-timezone

diff --git a/moment-timezone.js b/moment-timezone.js
@@ -1,5 +1,5 @@
 //! moment-timezone.js
-//! version : 0.2.0
+//! version : 0.2.1
 //! author : Tim Wood
 //! license : MIT
 //! github.com/moment/moment-timezone
@@ -21,7 +21,7 @@
 	// Do not load moment-timezone a second time.
 	if (moment.tz !== undefined) { return moment; }
 
-	var VERSION = "0.2.0",
+	var VERSION = "0.2.1",
 		zones = {},
 		links = {};
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "moment-timezone",
-	"version": "0.2.0",
+	"version": "0.2.1",
 	"description": "Parse and display moments in any timezone.",
 	"homepage": "http://momentjs.com/timezone/",
 	"author": "Tim Wood <washwithcare@gmail.com> (http://timwoodcreates.com/)",