Make sure the replaced Object.keys is non-enumerable.

Also, move the try/catch to a function.
paulmillr · Feb 16, 2015 · fb5b059 · fb5b059
1 parent c5528f5
commit fb5b059
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/es6-shim.js b/es6-shim.js
@@ -1098,13 +1098,19 @@
     }());
   }
 
-  try {
-    Object.keys('foo');
-  } catch (e) {
+  var objectKeysAcceptsPrimitives = (function () {
+    try {
+      Object.keys('foo');
+      return true;
+    } catch (e) {
+      return false;
+    }
+  }());
+  if (!objectKeysAcceptsPrimitives) {
     var originalObjectKeys = Object.keys;
-    Object.keys = function (obj) {
-      return originalObjectKeys(ES.ToObject(obj));
-    };
+    defineProperty(Object, 'keys', function keys(value) {
+      return originalObjectKeys(ES.ToObject(value));
+    }, true);
   }
 
   if (!RegExp.prototype.flags && supportsDescriptors) {