Incorporate discussed changes

diff --git a/src/lib/create/valid.js b/src/lib/create/valid.js
index 665abd35fb9cebc373b43623cdff2bcf39c92192..96b1cf615dcad122085251967bea851a4a283818 100644 (file)
--- a/src/lib/create/valid.js
+++ b/src/lib/create/valid.js
@@ -26,7 +26,7 @@ export function isValid(m) {
                 flags.bigHour === undefined;
         }
 
-        if (!Object.isFrozen(m)) {
+        if (Object.isFrozen == null || !Object.isFrozen(m)) {
             m._isValid = isNowValid;
         }
         else {

diff --git a/src/test/moment/to_type.js b/src/test/moment/to_type.js
index 51176ceda6b4f503a2810a7ae1bfb2cd678e663a..71c1fe17242e1bbfbafdd5e16d61eef908574edf 100644 (file)
--- a/src/test/moment/to_type.js
+++ b/src/test/moment/to_type.js
@@ -36,6 +36,8 @@ test('toJSON', function (assert) {
 test('toJSON works when moment is frozen', function (assert) {
     var expected = new Date().toISOString();
     var m = moment(expected);
-    Object.freeze(m);
+    if (Object.freeze != null) {
+        Object.freeze(m);
+    }
     assert.deepEqual(m.toJSON(), expected, 'toJSON when frozen invalid');
 });