mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Jeremy Rose 2021-06-24 08:50:48 -07:00 • committed by GitHub
parent 9de8e676dd
commit 0f16575eee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/browser/guest-window-proxy.ts
View file

@ -76,6 +76,7 @@ ipcMainInternal.on(
const referrer: Electron.Referrer = { url: '', policy: 'strict-origin-when-cross-origin' }; const referrer: Electron.Referrer = { url: '', policy: 'strict-origin-when-cross-origin' };
const browserWindowOptions = event.sender._callWindowOpenHandler(event, { url, frameName, features, disposition: 'new-window', referrer }); const browserWindowOptions = event.sender._callWindowOpenHandler(event, { url, frameName, features, disposition: 'new-window', referrer });
if (event.defaultPrevented) { if (event.defaultPrevented) {
event.returnValue = null;
return; return;
} }
const guest = openGuestWindow({ const guest = openGuestWindow({

6
spec-main/guest-window-manager-spec.ts
View file

@ -263,6 +263,12 @@ describe('webContents.setWindowOpenHandler', () => {
browserWindow.webContents.executeJavaScript("window.open('about:blank', '', 'show=no') && true"); browserWindow.webContents.executeJavaScript("window.open('about:blank', '', 'show=no') && 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);
});
}); });
} }
}); });