From 9490ec76869234760debf15f0da3d28350a3995d Mon Sep 17 00:00:00 2001 From: Michael Vasseur Date: Thu, 29 Sep 2016 16:01:05 +0200 Subject: [PATCH] Fix JS Lint issues --- lib/browser/guest-window-manager.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/browser/guest-window-manager.js b/lib/browser/guest-window-manager.js index 3f25469a023..f16118ec0a1 100644 --- a/lib/browser/guest-window-manager.js +++ b/lib/browser/guest-window-manager.js @@ -47,8 +47,7 @@ const mergeBrowserWindowOptions = function (embedder, options) { } // Setup a new guest with |embedder| -const setupGuest = function (embedder, frameName, guest) { - +const setupGuest = function (embedder, frameName, guest, options) { // When |embedder| is destroyed we should also destroy attached guest, and if // guest is closed by user then we should prevent |embedder| from double // closing guest. @@ -82,11 +81,11 @@ const setupGuest = function (embedder, frameName, guest) { }) } return guest.id -} +} // Create a new guest created by |embedder| with |options|. const createGuest = function (embedder, url, frameName, options) { - const guest = frameToGuest[frameName] + let guest = frameToGuest[frameName] if (frameName && (guest != null)) { guest.loadURL(url) return guest.id @@ -123,7 +122,7 @@ const createGuest = function (embedder, url, frameName, options) { guest.loadURL(url) } - return setupGuest(embedder, frameName, guest) + return setupGuest(embedder, frameName, guest, options) } const getGuestWindow = function (guestId) { @@ -146,8 +145,8 @@ ipcMain.on('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_OPEN', function (event, url, fr event.sender.emit('new-window', event, url, frameName, disposition, options, additionalFeatures) const newGuest = event.newGuest if ((event.sender.isGuest() && !event.sender.allowPopups) || event.defaultPrevented) { - if (newGuest != undefined && newGuest != null) { - event.returnValue = setupGuest(event.sender, frameName, newGuest) + if (newGuest !== undefined && newGuest !== null) { + event.returnValue = setupGuest(event.sender, frameName, newGuest, options) } else { event.returnValue = null }