github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-02-15 17:45:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Sets correct openerId in mergeBrowserWindowOptions() to give correct options to 'new-window' event handler

Browse Source
This commit is contained in:
Michael Vasseur
2016-09-29 15:43:40 +02:00
parent cc7f4fedf6
commit a2b3cf95a7
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/browser/guest-window-manager.js
View File

@@ -40,6 +40,9 @@ const mergeBrowserWindowOptions = function (embedder, options) {
options.webPreferences.nodeIntegration = false
}
// Sets correct openerId here to give correct options to 'new-window' event handler
options.webPreferences.openerId = embedder.id
return options
}
@@ -93,7 +96,7 @@ const createGuest = function (embedder, url, frameName, options) {
if (options.webPreferences == null) {
options.webPreferences = {}
}
options.webPreferences.openerId = embedder.id
guest = new BrowserWindow(options)
if (!options.webContents || url !== 'about:blank') {
// We should not call `loadURL` if the window was constructed from an