From a2b3cf95a747c331cabb0dd1f1e3ad93be6b3120 Mon Sep 17 00:00:00 2001 From: Michael Vasseur Date: Thu, 29 Sep 2016 15:43:40 +0200 Subject: [PATCH] Sets correct openerId in mergeBrowserWindowOptions() to give correct options to 'new-window' event handler --- lib/browser/guest-window-manager.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/browser/guest-window-manager.js b/lib/browser/guest-window-manager.js index 2c869cc65155..3f25469a0233 100644 --- a/lib/browser/guest-window-manager.js +++ b/lib/browser/guest-window-manager.js @@ -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