Small fix for polyfills loading in amd format.

matik12 · Aug 3, 2016 · 4293ad4 · 4293ad4
1 parent 9644f3d
commit 4293ad4
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 82 deletions.
diff --git a/dist/amd/oauth-polyfills.js b/dist/amd/oauth-polyfills.js
diff --git a/dist/commonjs/oauth-polyfills.js b/dist/commonjs/oauth-polyfills.js
diff --git a/dist/es6/oauth-polyfills.js b/dist/es6/oauth-polyfills.js
diff --git a/dist/system/oauth-polyfills.js b/dist/system/oauth-polyfills.js
diff --git a/dist/ts/oauth-polyfills.ts b/dist/ts/oauth-polyfills.ts
@@ -1,19 +1,13 @@
-export function objectAssign(target, ...args: any[]) {
-    if (target == null) {
+export function objectAssign(target, source) {
+    if (target == null || source == null) {
         throw new TypeError('Cannot convert undefined or null to object');
     }
 
     target = Object(target);
 
-    for (var index = 1; index < args.length; index++) {
-        var source = args[index];
-
-        if (source != null) {
-            for (var key in source) {
-                if (Object.prototype.hasOwnProperty.call(source, key)) {
-                    target[key] = source[key];
-                }
-            }
+    for (var key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+            target[key] = source[key];
         }
     }
 

diff --git a/src/oauth-polyfills.ts b/src/oauth-polyfills.ts
@@ -1,19 +1,13 @@
-export function objectAssign(target, ...args: any[]) {
-    if (target == null) {
+export function objectAssign(target, source) {
+    if (target == null || source == null) {
         throw new TypeError('Cannot convert undefined or null to object');
     }
 
     target = Object(target);
 
-    for (var index = 1; index < args.length; index++) {
-        var source = args[index];
-
-        if (source != null) {
-            for (var key in source) {
-                if (Object.prototype.hasOwnProperty.call(source, key)) {
-                    target[key] = source[key];
-                }
-            }
+    for (var key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+            target[key] = source[key];
         }
     }