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

'new-window' event handlers can return their window when default behavior is prevented

Browse source
This commit is contained in:
Michael Vasseur 2016-09-16 13:33:02 +02:00
parent ebaeec1677
commit 5a4cdcfde1
1 changed files with 28 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -43,20 +43,8 @@ const mergeBrowserWindowOptions = function (embedder, options) {
return options return options
} }
// Create a new guest created by |embedder| with |options|. // Setup a new guest with |embedder|
const createGuest = function (embedder, url, frameName, options) { const setupGuest = function (embedder, frameName, guest) {
let guest = frameToGuest[frameName]
if (frameName && (guest != null)) {
guest.loadURL(url)
return guest.id
}
// Remember the embedder window's id.
if (options.webPreferences == null) {
options.webPreferences = {}
}
options.webPreferences.openerId = embedder.id
guest = new BrowserWindow(options)
if (!options.webContents || url !== 'about:blank') { if (!options.webContents || url !== 'about:blank') {
// We should not call `loadURL` if the window was constructed from an // We should not call `loadURL` if the window was constructed from an
// existing webContents(window.open in a sandboxed renderer) and if the url // existing webContents(window.open in a sandboxed renderer) and if the url
@ -81,12 +69,10 @@ const createGuest = function (embedder, url, frameName, options) {
// here, since the window would be cleared of all changes in the next tick. // here, since the window would be cleared of all changes in the next tick.
guest.loadURL(url) guest.loadURL(url)
} }
// When |embedder| is destroyed we should also destroy attached guest, and if // When |embedder| is destroyed we should also destroy attached guest, and if
// guest is closed by user then we should prevent |embedder| from double // guest is closed by user then we should prevent |embedder| from double
// closing guest. // closing guest.
const guestId = guest.webContents.id const guestId = guest.id
const closedByEmbedder = function () { const closedByEmbedder = function () {
guest.removeListener('closed', closedByUser) guest.removeListener('closed', closedByUser)
guest.destroy() guest.destroy()
@ -108,7 +94,6 @@ const createGuest = function (embedder, url, frameName, options) {
embedder.once('render-view-deleted', closedByEmbedder) embedder.once('render-view-deleted', closedByEmbedder)
guest.once('closed', closedByUser) guest.once('closed', closedByUser)
} }
if (frameName) { if (frameName) {
frameToGuest[frameName] = guest frameToGuest[frameName] = guest
guest.frameName = frameName guest.frameName = frameName
@ -116,8 +101,26 @@ const createGuest = function (embedder, url, frameName, options) {
delete frameToGuest[frameName] delete frameToGuest[frameName]
}) })
} }
return guest.id
}
return guestId // Create a new guest created by |embedder| with |options|.
const createGuest = function (embedder, url, frameName, options) {
const guest = frameToGuest[frameName]
if (frameName && (guest != null)) {
guest.loadURL(url)
return guest.id
}
// Remember the embedder window's id.
if (options.webPreferences == null) {
options.webPreferences = {}
}
options.webPreferences.openerId = embedder.id
guest = new BrowserWindow(options)
guest.loadURL(url)
return setupGuest(embedder, frameName, guest)
} }
const getGuestWindow = function (guestId) { const getGuestWindow = function (guestId) {
@ -138,8 +141,13 @@ const getGuestWindow = function (guestId) {
ipcMain.on('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_OPEN', function (event, url, frameName, disposition, options, additionalFeatures) { ipcMain.on('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_OPEN', function (event, url, frameName, disposition, options, additionalFeatures) {
options = mergeBrowserWindowOptions(event.sender, options) options = mergeBrowserWindowOptions(event.sender, options)
event.sender.emit('new-window', event, url, frameName, disposition, options, additionalFeatures) event.sender.emit('new-window', event, url, frameName, disposition, options, additionalFeatures)
var newGuest = event.newGuest
if ((event.sender.isGuest() && !event.sender.allowPopups) || event.defaultPrevented) { if ((event.sender.isGuest() && !event.sender.allowPopups) || event.defaultPrevented) {
event.returnValue = null if (newGuest != undefined && newGuest != null) {
event.returnValue = setupGuest(event.sender, frameName, newGuest)
} else {
event.returnValue = null
}
} else { } else {
event.returnValue = createGuest(event.sender, url, frameName, options) event.returnValue = createGuest(event.sender, url, frameName, options)
} }