From: Tim Wood <washwithcare@gmail.com>
Date: Thu, 31 May 2012 23:03:45 +0000 (-0700)
Subject: Fixing moment.utc(number). #323
X-Git-Tag: 1.7.0~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=635bd20e91cdda3068432e44cfde818d55ece099;p=thirdparty%2Fmoment.git

Fixing moment.utc(number). #323
---

diff --git a/moment.js b/moment.js
index 54d97e291..003154a8a 100644
--- a/moment.js
+++ b/moment.js
@@ -581,7 +581,7 @@
         }
         return (format && input) ?
             moment(input + ' +0000', format + ' Z').utc() :
-            moment(input && !parseTokenTimezone.exec(input) ? input + '+0000' : input).utc();
+            moment(input && isoRegex.exec(input) && !parseTokenTimezone.exec(input) ? input + '+0000' : input).utc();
     };
 
     // creating with unix timestamp (in seconds)
diff --git a/test/moment/create.js b/test/moment/create.js
index d806dd813..9b70cfe86 100644
--- a/test/moment/create.js
+++ b/test/moment/create.js
@@ -15,9 +15,10 @@ exports.create = {
     },
 
     "number" : function(test) {
-        test.expect(2);
+        test.expect(3);
         test.ok(moment(1000).toDate() instanceof Date, "1000");
         test.ok((moment(1000).valueOf() === 1000), "testing valueOf");
+        test.ok((moment.utc(1000).valueOf() === 1000), "testing valueOf");
         test.done();
     },