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

browser: fix disposition value for new-window event

Browse source
This commit is contained in:
Robo 2016-03-25 08:47:33 +05:30 • committed by deepak1556
parent 7353fb4296
commit 7016fbe258
4 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/browser/api/browser-window.js
View file

@ -21,14 +21,14 @@ BrowserWindow.prototype._init = function () {
}
// Make new windows requested by links behave like "window.open"
this.webContents.on('-new-window', (event, url, frameName) => {
this.webContents.on('-new-window', (event, url, frameName, disposition) => {
var options
options = {
show: true,
width: 800,
height: 600
}
return ipcMain.emit('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_OPEN', event, url, frameName, options)
return ipcMain.emit('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_OPEN', event, url, frameName, disposition, options)
})
// window.resizeTo(...)

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

@ -80,9 +80,9 @@ var createGuest = function (embedder, url, frameName, options) {
}
// Routed window.open messages.
ipcMain.on('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_OPEN', function (event, url, frameName, options) {
ipcMain.on('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_OPEN', function (event, url, frameName, disposition, options) {
options = mergeBrowserWindowOptions(event.sender, options)
event.sender.emit('new-window', event, url, frameName, 'new-window', options)
event.sender.emit('new-window', event, url, frameName, disposition, options)
if ((event.sender.isGuest() && !event.sender.allowPopups) || event.defaultPrevented) {
event.returnValue = null
} else {