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

Add "frameName" as paramter for "new-window" event

Browse source
This commit is contained in:
Cheng Zhao 2014-10-27 19:14:17 +08:00
parent 389e56ce36
commit fefeb39757
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/atom_api_web_contents.cc
View file

@ -88,7 +88,7 @@ bool WebContents::ShouldCreateWebContents(
content::SessionStorageNamespace* session_storage_namespace) { content::SessionStorageNamespace* session_storage_namespace) {
base::ListValue args; base::ListValue args;
args.AppendString(target_url.spec()); args.AppendString(target_url.spec());
args.AppendString(partition_id); args.AppendString(frame_name);
Emit("new-window", args); Emit("new-window", args);
return false; return false;
} }

4
atom/browser/api/lib/web-contents.coffee
View file

@ -3,8 +3,8 @@ binding = process.atomBinding 'web_contents'
ipc = require 'ipc' ipc = require 'ipc'
# Routed window.open messages. # Routed window.open messages.
ipc.on 'ATOM_SHELL_WEB_CONTENTS_WINDOW_OPEN', (event, url, name, features) -> ipc.on 'ATOM_SHELL_WEB_CONTENTS_WINDOW_OPEN', (event, args...) ->
event.sender.emit 'new-window', url, name, features event.sender.emit 'new-window', event, args...
module.exports.wrap = (webContents) -> module.exports.wrap = (webContents) ->
return null unless webContents.isAlive() return null unless webContents.isAlive()

2
atom/renderer/lib/guest-view-internal.coffee
View file

@ -10,7 +10,7 @@ WEB_VIEW_EVENTS =
'did-stop-loading': [] 'did-stop-loading': []
'did-get-redirect-request': ['oldUrl', 'newUrl', 'isMainFrame'] 'did-get-redirect-request': ['oldUrl', 'newUrl', 'isMainFrame']
'console-message': ['level', 'message', 'line', 'sourceId'] 'console-message': ['level', 'message', 'line', 'sourceId']
'new-window': ['url', 'partitionId'] 'new-window': ['url', 'frameName']
'close': [] 'close': []
'crashed': [] 'crashed': []
'destroyed': [] 'destroyed': []

6
atom/renderer/lib/override.coffee
View file

@ -2,13 +2,13 @@ process = global.process
ipc = require 'ipc' ipc = require 'ipc'
remote = require 'remote' remote = require 'remote'
if process.guestInstanceId? unless process.guestInstanceId?
# Override default window.close. # Override default window.close.
window.close = -> window.close = ->
remote.getCurrentWindow().close() remote.getCurrentWindow().close()
# Make the browser window or guest view emit "new-window" event. # Make the browser window or guest view emit "new-window" event.
window.open = (url, name='', features='') -> window.open = (url, frameName='', features='') ->
options = {} options = {}
for feature in features.split ',' for feature in features.split ','
[name, value] = feature.split '=' [name, value] = feature.split '='
@ -25,7 +25,7 @@ window.open = (url, name='', features='') ->
options.width ?= 800 options.width ?= 800
options.height ?= 600 options.height ?= 600
ipc.send 'ATOM_SHELL_WEB_CONTENTS_WINDOW_OPEN', url, name, features ipc.send 'ATOM_SHELL_WEB_CONTENTS_WINDOW_OPEN', url, frameName, options
# Use the dialog API to implement alert(). # Use the dialog API to implement alert().
window.alert = (message, title='') -> window.alert = (message, title='') ->

2
docs/api/web-view-tag.md
View file

@ -237,7 +237,7 @@ webview.addEventListener('console-message', function(e) {
### new-window ### new-window
* `url` String * `url` String
* `partitionId` String * `frameName` String
Fired when the guest page attempts to open a new browser window. Fired when the guest page attempts to open a new browser window.