[Bugfix beta] Ember.keys works with null prototype objects correctly

* container uses this to work correctly in < IE8
emberjs · Aug 18, 2014 · 7db120f · 7db120f
1 parent fac79a1
commit 7db120f
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 104 deletions.
diff --git a/packages/container/lib/container.js b/packages/container/lib/container.js
@@ -796,7 +796,7 @@ function instantiate(container, fullName) {
 
 function eachDestroyable(container, callback) {
   var cache = container.cache;
-  var keys = Object.keys(cache);
+  var keys = Ember.keys(cache);
   var key, value;
 
   for (var i = 0, l = keys.length; i < l; i++) {

diff --git a/packages/ember-metal/lib/keys.js b/packages/ember-metal/lib/keys.js
@@ -38,7 +38,7 @@ if (!keys || create.isSimulated) {
       return;
     }
 
-    if (typeof obj.hasOwnProperty === 'function' && !obj.hasOwnProperty(key)) {
+    if (!Object.prototype.hasOwnProperty.call(obj, key)) {
       return;
     }
 

diff --git a/packages/ember-runtime/lib/system/core_object.js b/packages/ember-runtime/lib/system/core_object.js
@@ -207,7 +207,6 @@ function makeCtor() {
 */
 var CoreObject = makeCtor();
 CoreObject.toString = function() { return "Ember.CoreObject"; };
-
 CoreObject.PrototypeMixin = Mixin.create({
   reopen: function() {
     var length = arguments.length;

diff --git a/packages/ember-runtime/tests/core/keys_test.js b/packages/ember-runtime/tests/core/keys_test.js