Object.assign should be shimmed in all environments, not just a true …

…ES5 environment
paulmillr · Jun 2, 2014 · 9a60512 · 9a60512
1 parent 46806e9
commit 9a60512
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/es6-shim.js b/es6-shim.js
@@ -772,8 +772,10 @@
             proto = Object.getPrototypeOf(proto);
           }
           return result;
-        },
+        }
+      });
 
+      defineProperties(Object, {
         // 19.1.3.1
         assign: function(target, source) {
           if (!ES.TypeIsObject(target)) {
@@ -788,12 +790,10 @@
               return target;
             }, target);
           });
-        }
-      });
+        },
 
-      // 19.1.3.9
-      // shim from https://gist.github.com/WebReflection/5593554
-      defineProperties(Object, {
+        // 19.1.3.9
+        // shim from https://gist.github.com/WebReflection/5593554
         setPrototypeOf: (function(Object, magic) {
           var set;