fix: stop window.open from hanging when prevented (#29881)

* fix: stop window.open from hanging when prevented * add test Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
electron · Jun 28, 2021 · 5bef67a · 5bef67a
1 parent a6f26b5
commit 5bef67a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/lib/browser/guest-window-proxy.ts b/lib/browser/guest-window-proxy.ts
@@ -75,6 +75,7 @@ ipcMainInternal.on(
 
     const browserWindowOptions = (event.sender as any)._callWindowOpenHandler(event, url, frameName, features);
     if (event.defaultPrevented) {
+      event.returnValue = null;
       return;
     }
     const guest = openGuestWindow({

diff --git a/spec-main/guest-window-manager-spec.ts b/spec-main/guest-window-manager-spec.ts
@@ -224,6 +224,12 @@ describe('webContents.setWindowOpenHandler', () => {
 
         browserWindow.webContents.executeJavaScript("window.open('about:blank') && true");
       });
+
+      it('does not hang parent window when denying window.open', async () => {
+        browserWindow.webContents.setWindowOpenHandler(() => ({ action: 'deny' }));
+        browserWindow.webContents.executeJavaScript("window.open('https://127.0.0.1')");
+        expect(await browserWindow.webContents.executeJavaScript('42')).to.equal(42);
+      });
     });
   }
 });