From: Iskren Chernev Date: Tue, 14 Jan 2014 17:17:44 +0000 (-0800) Subject: put _isAMomentObject in utc moments too X-Git-Tag: 2.5.1~5^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4c08381f53b6a61f847508c991eab5388f4a4a9;p=thirdparty%2Fmoment.git put _isAMomentObject in utc moments too --- diff --git a/moment.js b/moment.js index 8690dc9b7..d9afce2af 100644 --- a/moment.js +++ b/moment.js @@ -1593,6 +1593,7 @@ lang = undefined; } m = makeMoment({ + _isAMomentObject: true, _useUTC : true, _isUTC : true, _l : lang, diff --git a/test/moment/create.js b/test/moment/create.js index d65de741e..23f687329 100644 --- a/test/moment/create.js +++ b/test/moment/create.js @@ -112,11 +112,13 @@ exports.create = { a[i] = b[i]; } return a; - }, - now = moment(); + }; + now = moment(), + nowu = moment.utc(); - test.expect(1); + test.expect(2); test.equal(+extend({}, now).clone(), +now, "cloning extend-ed now is now"); + test.equal(+extend({}, nowu).clone(), +nowu, "cloning extend-ed utc now is utc now"); test.done(); }, diff --git a/test/moment/is_moment.js b/test/moment/is_moment.js index 697270926..1fd2a6e40 100644 --- a/test/moment/is_moment.js +++ b/test/moment/is_moment.js @@ -2,7 +2,7 @@ var moment = require('../../moment'); exports.is_moment = { "is moment object": function (test) { - test.expect(12); + test.expect(13); var MyObj = function () {}, extend = function(a, b) { @@ -19,6 +19,7 @@ exports.is_moment = { test.ok(moment.isMoment(moment()), 'simple moment object'); test.ok(moment.isMoment(moment('invalid date')), 'invalid moment object'); test.ok(moment.isMoment(extend({}, moment())), 'externally cloned moments are moments'); + test.ok(moment.isMoment(extend({}, moment.utc())), 'externally cloned utc moments are moments'); test.ok(!moment.isMoment(new MyObj()), 'myObj is not moment object'); test.ok(!moment.isMoment(moment), 'moment function is not moment object');