Allow moment.fn.utc to clear the timezone flag #86

moment-timezone.js

@@ -76,12 +76,12 @@
 		}
 	}
 
-	function intToUntil (array) {
-		for (var i = 0; i < array.length; i++) {
+	function intToUntil (array, length) {
+		for (var i = 0; i < length; i++) {
 			array[i] = Math.round((array[i - 1] || 0) + (array[i] * 60000)); // minutes to milliseconds
 		}
 
-		array.push(Infinity);
+		array[length - 1] = Infinity;
 	}
 
 	function mapIndices (source, indices) {
@@ -104,7 +104,7 @@
 		arrayToInt(indices);
 		arrayToInt(untils);
 
-		intToUntil(untils);
+		intToUntil(untils, indices.length);
 
 		return {
 			name    : data[0],
@@ -310,8 +310,16 @@
 		};
 	}
 
+	function resetZoneWrap (old) {
+		return function () {
+			this._z = null;
+			return old.call(this);
+		};
+	}
+
 	fn.zoneName = abbrWrap(fn.zoneName);
 	fn.zoneAbbr = abbrWrap(fn.zoneAbbr);
+	fn.utc      = resetZoneWrap(fn.utc);
 
 	// Cloning a moment should include the _z property.
 	moment.momentProperties._z = null;

tests/moment-timezone/utc.js

@@ -0,0 +1,46 @@
+"use strict";
+
+var moment = require("../../");
+
+exports.utc = {
+	utc : function (test) {
+		moment.tz.add([
+			"TestUTC/Pacific|PST|80|0|",
+			"TestUTC/Eastern|EST|50|0|"
+		]);
+
+		var m = moment("2014-07-10 12:00:00+00:00"),
+			localFormat = m.format(),
+			localZone = m.zone();
+
+		m.tz("TestUTC/Pacific");
+
+		test.equal(m.zone(), 480, "Should change the offset when using moment.fn.tz");
+		test.equal(m.format(), "2014-07-10T04:00:00-08:00", "Should change the offset when using moment.fn.tz");
+
+		m.utc();
+		moment.updateOffset(m);
+
+		test.equal(m.zone(), 0, "Should set the offset to +00:00 when using moment.fn.utc");
+		test.equal(m.format(), "2014-07-10T12:00:00+00:00", "Should change the offset when using moment.fn.utc");
+
+		m.tz("TestUTC/Eastern");
+
+		test.equal(m.zone(), 300, "Should change the offset when using moment.fn.tz");
+		test.equal(m.format(), "2014-07-10T07:00:00-05:00", "Should change the offset when using moment.fn.tz");
+
+		m.utc();
+		moment.updateOffset(m);
+
+		test.equal(m.zone(), 0, "Should set the offset to +00:00 when using moment.fn.utc");
+		test.equal(m.format(), "2014-07-10T12:00:00+00:00", "Should change the offset when using moment.fn.utc");
+
+		m.local();
+		moment.updateOffset(m);
+
+		test.equal(m.zone(), localZone, "Should reset the offset to local time when using moment.fn.local");
+		test.equal(m.format(), localFormat, "Should reset the offset to local time when using moment.fn.local");
+
+		test.done();
+	}
+};