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

Fix JS Lint issues

Browse source
This commit is contained in:
Michael Vasseur 2016-09-29 16:01:05 +02:00
parent a2b3cf95a7
commit 9490ec7686
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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
}