From a2fda50da28a7ef168227322f4df830130c174ce Mon Sep 17 00:00:00 2001 From: Joshua Ohlman Date: Sat, 4 Jul 2015 08:05:03 -0500 Subject: [PATCH] Revert "valueOf should return NaN for any invalid moment" This reverts commit c314f03a9b7153fcab55942878a9899ad74ce73e. --- src/lib/moment/to-type.js | 3 --- src/test/moment/invalid.js | 8 -------- src/test/moment/is_same.js | 12 ------------ 3 files changed, 23 deletions(-) diff --git a/src/lib/moment/to-type.js b/src/lib/moment/to-type.js index c8831adee..edc1338d1 100644 --- a/src/lib/moment/to-type.js +++ b/src/lib/moment/to-type.js @@ -1,7 +1,4 @@ export function valueOf () { - if (!this.isValid()) { - return NaN; - } return +this._d - ((this._offset || 0) * 60000); } diff --git a/src/test/moment/invalid.js b/src/test/moment/invalid.js index b03b81461..599a6ddc9 100644 --- a/src/test/moment/invalid.js +++ b/src/test/moment/invalid.js @@ -25,11 +25,3 @@ test('invalid with custom flag', function (assert) { assert.equal(m.parsingFlags().tooBusyWith, 'reiculating splines'); assert.ok(isNaN(m.valueOf())); }); - -test('invalid with valid date', function (assert) { - var m = moment.invalid(); - m._d = new Date(); - assert.equal(m.isValid(), false); - assert.equal(m.parsingFlags().userInvalidated, true); - assert.ok(isNaN(m.valueOf())); -}); diff --git a/src/test/moment/is_same.js b/src/test/moment/is_same.js index 8971fe2cf..31794ce78 100644 --- a/src/test/moment/is_same.js +++ b/src/test/moment/is_same.js @@ -145,15 +145,3 @@ test('is same with utc offset moments', function (assert) { assert.ok(moment.parseZone('2013-02-01T-05:00').isSame(moment.parseZone('2013-02-01T-06:30'), 'year'), 'zoned vs (differently) zoned moment'); }); - -test('is same with invalid moments', function (assert) { - assert.equal(moment.invalid().isSame(moment.invalid()), false, 'invalid moments are not considered equal'); - assert.equal(moment.invalid().year(2010).isSame(moment.invalid().year(2010)), false, 'with year set'); - assert.equal(moment.invalid().month(10).isSame(moment.invalid().month(10)), false, 'with month set'); - assert.equal(moment.invalid().week(2).isSame(moment.invalid().week(2)), false, 'with week set'); - assert.equal(moment.invalid().day(2).isSame(moment.invalid().day(2)), false, 'with day set'); - assert.equal(moment.invalid().hour(2).isSame(moment.invalid().hour(2)), false, 'with hour set'); - assert.equal(moment.invalid().minute(2).isSame(moment.invalid().minute(2)), false, 'with minute set'); - assert.equal(moment.invalid().second(2).isSame(moment.invalid().second(2)), false, 'with second set'); - assert.equal(moment.invalid().millisecond(2).isSame(moment.invalid().millisecond(2)), false, 'with millisecond set'); -}); -- 2.47.3