From: Michael Garvin <gar+gh@danger.computer>
Date: Mon, 11 Jan 2016 23:50:35 +0000 (-0800)
Subject: Fix toJSON casting of invalid moment (#2886)
X-Git-Tag: 2.12.0~12^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a289cf13aa567d06ed1d0a767cb0144588afd7b9;p=thirdparty%2Fmoment.git

Fix toJSON casting of invalid moment (#2886)

Invalid moments were casting as 'null' (the string)
Now they are properly casting as null (the literal)
---

diff --git a/src/lib/moment/to-type.js b/src/lib/moment/to-type.js
index b6787afe6..3581b5c43 100644
--- a/src/lib/moment/to-type.js
+++ b/src/lib/moment/to-type.js
@@ -29,6 +29,6 @@ export function toObject () {
 }
 
 export function toJSON () {
-    // JSON.stringify(new Date(NaN)) === 'null'
-    return this.isValid() ? this.toISOString() : 'null';
+    // JSON.stringify(new Date(NaN)) === null
+    return this.isValid() ? this.toISOString() : null;
 }
diff --git a/src/test/moment/invalid.js b/src/test/moment/invalid.js
index 7a976269d..0d62c75f8 100644
--- a/src/test/moment/invalid.js
+++ b/src/test/moment/invalid.js
@@ -99,7 +99,7 @@ test('invalid operations', function (assert) {
         });
         assert.ok(moment.isDate(invalid.toDate()));
         assert.ok(isNaN(invalid.toDate().valueOf()));
-        assert.equal(invalid.toJSON(), 'null');
+        assert.equal(invalid.toJSON(), null);
         assert.equal(invalid.toString(), 'Invalid date');
         assert.ok(isNaN(invalid.unix()));
         assert.ok(isNaN(invalid.valueOf()));