This commit is contained in:
Michael Vasseur 2016-09-29 14:41:35 +02:00
Родитель 5a4cdcfde1
Коммит 3408c8038e
1 изменённых файлов: 4 добавлений и 4 удалений

Просмотреть файл

@ -141,13 +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 const newGuest = event.newGuest
if ((event.sender.isGuest() && !event.sender.allowPopups) || event.defaultPrevented) { if ((event.sender.isGuest() && !event.sender.allowPopups) || event.defaultPrevented) {
if (newGuest != undefined && newGuest != null) { if (newGuest != undefined && newGuest != null) {
event.returnValue = setupGuest(event.sender, frameName, newGuest) event.returnValue = setupGuest(event.sender, frameName, newGuest)
} else { } else {
event.returnValue = null event.returnValue = null
} }
} else { } else {
event.returnValue = createGuest(event.sender, url, frameName, options) event.returnValue = createGuest(event.sender, url, frameName, options)
} }