Merge pull request #215 from ljharb/clean_up_sham_getprototypeof

Attempting to clean up the getPrototypeOf sham logic
es-shims · Mar 30, 2014 · 58b97af · 58b97af
2 parents 0ea39ab + 59f400f
commit 58b97af
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/es5-sham.js b/es5-sham.js
@@ -52,9 +52,13 @@ if (!Object.getPrototypeOf) {
     // ... Opera Mini breaks here with infinite loops
     Object.getPrototypeOf = function getPrototypeOf(object) {
         var proto = object.__proto__;
-        return (proto || (proto === null && proto)) || (
-            object.constructor ? object.constructor.prototype : prototypeOfObject
-        );
+        if (proto || proto === null) {
+            return proto;
+        } else if (object.constructor) {
+            return object.constructor.prototype;
+        } else {
+            return prototypeOfObject;
+        }
     };
 }