Using Object.keys() instead.

paulmillr · Jun 2, 2014 · ebdf41d · ebdf41d
1 parent 357be95
commit ebdf41d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 20 deletions.
diff --git a/es6-shim.js b/es6-shim.js
@@ -762,15 +762,7 @@
         },
 
         getPropertyNames: function(subject) {
-          var getOwnPropertyNames = function(object){
-            var props = [];
-            for (var key in object) {
-                if (object.hasOwnProperty(key)) 
-                    props.push(key); 
-            }
-            return props;
-          };
-          var result = getOwnPropertyNames(subject);
+          var result = Object.keys(subject);
           var proto = Object.getPrototypeOf(subject);
 
           var addProperty = function(property) {
@@ -780,7 +772,7 @@
           };
 
           while (proto !== null) {
-            getOwnPropertyNames(proto).forEach(addProperty);
+            Object.keys(proto).forEach(addProperty);
             proto = Object.getPrototypeOf(proto);
           }
           return result;

diff --git a/test/object.js b/test/object.js
@@ -55,21 +55,13 @@ describe('Object', function() {
   });
 
   describe('Object.getPropertyNames()', function() {
-    var getOwnPropertyNames = function(object){
-      var props = [];
-      for (var key in object) {
-          if (object.hasOwnProperty(key)) 
-              props.push(key); 
-      }
-      return props;
-    };
     it('should produce an array of property names including inherited ones',
       function() {
       expect(Object.getPropertyNames(Object.create(null))).to.eql([]);
       var obj = {};
       expect(Object.getPropertyNames(Object.create(obj))).to.eql(
-          getOwnPropertyNames(obj).concat(
-            getOwnPropertyNames(Object.getPrototypeOf(obj))
+          Object.keys(obj).concat(
+            Object.keys(Object.getPrototypeOf(obj))
         )
       );
     });