Fix bridge cleanup logic

krakenjs · Nov 7, 2017 · 2f9dbc3 · 2f9dbc3
1 parent 11d6d0e
commit 2f9dbc3
Showing 1 changed file with 12 additions and 18 deletions.
diff --git a/src/bridge/parent.js b/src/bridge/parent.js
@@ -125,31 +125,24 @@ export function openBridge(url : string, domain : string) : ZalgoPromise<CrossDo
 
         return documentBodyReady.then(body => {
 
-            return new ZalgoPromise((resolve, reject) => {
-
-                setTimeout(resolve, 1);
-
-            }).then(() => {
+            body.appendChild(iframe);
 
-                body.appendChild(iframe);
+            let bridge = iframe.contentWindow;
 
-                let bridge = iframe.contentWindow;
+            listenForRegister(bridge, domain);
 
-                listenForRegister(bridge, domain);
-
-                return new ZalgoPromise((resolve, reject) => {
+            return new ZalgoPromise((resolve, reject) => {
 
-                    iframe.onload = resolve;
-                    iframe.onerror = reject;
+                iframe.onload = resolve;
+                iframe.onerror = reject;
 
-                }).then(() => {
+            }).then(() => {
 
-                    return onWindowReady(bridge, CONFIG.BRIDGE_TIMEOUT, `Bridge ${url}`);
+                return onWindowReady(bridge, CONFIG.BRIDGE_TIMEOUT, `Bridge ${url}`);
 
-                }).then(() => {
+            }).then(() => {
 
-                    return bridge;
-                });
+                return bridge;
             });
         });
     });
@@ -215,9 +208,10 @@ export function linkUrl(win : CrossDomainWindowType, url : string) {
 export function destroyBridges() {
     for (let domain of Object.keys(global.bridgeFrames)) {
         let frame = global.bridgeFrames[domain];
-        if (frame && frame.parentNode) {
+        if (frame.parentNode) {
             frame.parentNode.removeChild(frame);
         }
     }
+    global.bridgeFrames = {};
     global.bridges = {};
 }