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

Redirect BrowserWindow's "will-navigate" event to WebContents

Browse source
This commit is contained in:
Cheng Zhao 2014-12-17 14:56:51 -08:00
parent 60df32aab5
commit c2975d2bcc
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -95,7 +95,7 @@ void Window::WillCreatePopupWindow(const base::string16& frame_name,
void Window::WillNavigate(bool* prevent_default, const GURL& url) {
base::ListValue args;
args.AppendString(url.spec());
*prevent_default = Emit("will-navigate", args);
*prevent_default = Emit("-will-navigate", args);
}
void Window::WillCloseWindow(bool* prevent_default) {

4
atom/browser/api/lib/browser-window.coffee
View file

@ -30,6 +30,10 @@ BrowserWindow::_init = ->
options = show: true, width: 800, height: 600
ipc.emit 'ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_OPEN', event, url, frameName, options
# Redirect "will-navigate" to webContents.
@on '-will-navigate', (event, url) =>
@webContents.emit 'will-navigate', event, url
# Remove the window from weak map immediately when it's destroyed, since we
# could be iterating windows before GC happened.
@once 'closed', =>