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

Fix ELECTRON_GUEST_WINDOW_MANAGER_INTERNAL_WINDOW_OPEN handler

Browse source
This commit is contained in:
Ryohei Ikegami 2017-03-19 17:52:39 +09:00
parent 2c7343293a
commit 319a7759d0
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/browser/guest-window-manager.js
View file

@ -242,12 +242,16 @@ ipcMain.on('ELECTRON_GUEST_WINDOW_MANAGER_INTERNAL_WINDOW_OPEN', function (event
disposition, options, disposition, options,
additionalFeatures, postData) { additionalFeatures, postData) {
options = mergeBrowserWindowOptions(event.sender, options) options = mergeBrowserWindowOptions(event.sender, options)
event.sender.emit('new-window', event, url, frameName, disposition, options, additionalFeatures) const newWindowEvent = {
const newGuest = event.newGuest preventDefault: () => newWindowEvent.defaultPrevented = true
if ((event.sender.isGuest() && !event.sender.allowPopups) || event.defaultPrevented) { }
event.sender.emit('new-window', newWindowEvent, url, frameName, disposition, options, additionalFeatures)
const newGuest = newWindowEvent.newGuest
if ((event.sender.isGuest() && !event.sender.allowPopups) || newWindowEvent.defaultPrevented) {
if (newGuest !== undefined && newGuest !== null) { if (newGuest !== undefined && newGuest !== null) {
event.returnValue = setupGuest(event.sender, frameName, newGuest, options) event.returnValue = setupGuest(event.sender, frameName, newGuest, options)
} else { } else {
event.preventDefault()
event.returnValue = null event.returnValue = null
} }
} else { } else {