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

Send isMainFrame as argument to did-navigate-in-page event

Browse source
This commit is contained in:
Samuel Attard 2016-08-12 01:27:50 +10:00
parent 58b391cb77
commit 5b07e8dd5b
No known key found for this signature in database
GPG key ID: 273DC1869D8F13EF
4 changed files with 830 additions and 828 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

@ -674,7 +674,7 @@ void WebContents::DidFinishNavigation(
if (is_main_frame && !is_in_page) { if (is_main_frame && !is_in_page) {
Emit("did-navigate", url); Emit("did-navigate", url);
} else if (is_in_page) { } else if (is_in_page) {
Emit("did-navigate-in-page", url); Emit("did-navigate-in-page", url, is_main_frame);
} }
} else { } else {
auto url = navigation_handle->GetURL(); auto url = navigation_handle->GetURL();

1
docs/api/web-contents.md
View file

@ -185,6 +185,7 @@ Returns:
* `event` Event * `event` Event
* `url` String * `url` String
* `isMainPage` Boolean
Emitted when an in-page navigation happened. Emitted when an in-page navigation happened.

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

File diff suppressed because it is too large Load diff

2
lib/renderer/web-view/guest-view-internal.js
View file

@ -22,7 +22,7 @@ var WEB_VIEW_EVENTS = {
'new-window': ['url', 'frameName', 'disposition', 'options'], 'new-window': ['url', 'frameName', 'disposition', 'options'],
'will-navigate': ['url'], 'will-navigate': ['url'],
'did-navigate': ['url'], 'did-navigate': ['url'],
'did-navigate-in-page': ['url'], 'did-navigate-in-page': ['url', 'isMainFrame'],
'close': [], 'close': [],
'crashed': [], 'crashed': [],
'gpu-crashed': [], 'gpu-crashed': [],