Merge pull request aws-amplify#636 from elorzafe/master

Fix problem with Polyfills
andreiserea · Apr 11, 2018 · 35fa9b8 · 35fa9b8
2 parents 9e34ef0 + 321d830
commit 35fa9b8
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/packages/aws-amplify/src/Common/Polyfills/Polyfills.ts b/packages/aws-amplify/src/Common/Polyfills/Polyfills.ts
@@ -14,13 +14,16 @@
 
 import InMemoryCache from '../../Cache/InMemoryCache';
 
-(<any>global).window = (<any>global).window || {
-    setTimeout,
-    clearTimeout,
-    WebSocket: (<any>global).WebSocket,
-    ArrayBuffer: (<any>global).ArrayBuffer,
-    addEventListener(){ },
-    navigator: { onLine: true }
-};
-(<any>global).localStorage = (<any>global).localStorage || InMemoryCache;
-
+if (!(<any>global).window) {
+    (<any>global).window = {
+        setTimeout,
+        clearTimeout,
+        WebSocket: (<any>global).WebSocket,
+        ArrayBuffer: (<any>global).ArrayBuffer,
+        addEventListener(){ },
+        navigator: { onLine: true }
+    };
+}
+if (!(<any>global).localStorage) {
+    (<any>global).localStorage = InMemoryCache;
+}