Address potential issue with Object.defineProperty

nivertech · Oct 16, 2011 · 57c00b8 · 57c00b8
1 parent bfd5157
commit 57c00b8
Showing 1 changed file with 16 additions and 15 deletions.
diff --git a/lib/nowUtil.js b/lib/nowUtil.js
@@ -3,21 +3,6 @@
  * in NowJS.
  */
 
-Object.defineProperty(Array.prototype,
-                      'toJSON',
-                      { enumerable: false,
-                        value: function () {
-                          if (Array.isArray(this)) {
-                            return this;
-                          }
-                          var toReturn = [];
-                          for (var i = 0, ll = this.length; i < ll; i++) {
-                            toReturn[i] = this[i];
-                          }
-                          return toReturn;
-                        }
-                      });
-
 var util = {
   parseCookie: function (cookie) {
     if (typeof cookie !== 'string') {
@@ -161,4 +146,20 @@ var util = {
   }
 };
 
+if (!util.hasProperty(Array.prototype, 'toJSON')) {
+  var obj = { enumerable: false,
+              value: function () {
+                if (Array.isArray(this)) {
+                  return this;
+                }
+                var toReturn = [];
+                for (var i = 0, ll = this.length; i < ll; i++) {
+                  toReturn[i] = this[i];
+                }
+                return toReturn;
+              }
+            };
+  Object.defineProperty(Array.prototype, 'toJSON', obj);
+}
+
 exports.nowUtil = util;