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

add ValidatedUrl to did-fail-load event

Browse source
This commit is contained in:
Gohy Leandre 2015-08-31 11:18:10 +02:00
parent 9dc6cfc1e9
commit 590be75fa9
4 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -388,7 +388,7 @@ void WebContents::DidFailProvisionalLoad(
int error_code, int error_code,
const base::string16& error_description, const base::string16& error_description,
bool was_ignored_by_handler) { bool was_ignored_by_handler) {
Emit("did-fail-load", error_code, error_description); Emit("did-fail-load", error_code, error_description, validated_url);
} }
void WebContents::DidFailLoad(content::RenderFrameHost* render_frame_host, void WebContents::DidFailLoad(content::RenderFrameHost* render_frame_host,
@ -396,7 +396,7 @@ void WebContents::DidFailLoad(content::RenderFrameHost* render_frame_host,
int error_code, int error_code,
const base::string16& error_description, const base::string16& error_description,
bool was_ignored_by_handler) { bool was_ignored_by_handler) {
Emit("did-fail-load", error_code, error_description); Emit("did-fail-load", error_code, error_description, validated_url);
} }
void WebContents::DidStartLoading() { void WebContents::DidStartLoading() {

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

@ -6,7 +6,7 @@ requestId = 0
WEB_VIEW_EVENTS = WEB_VIEW_EVENTS =
'load-commit': ['url', 'isMainFrame'] 'load-commit': ['url', 'isMainFrame']
'did-finish-load': [] 'did-finish-load': []
'did-fail-load': ['errorCode', 'errorDescription'] 'did-fail-load': ['errorCode', 'errorDescription', 'validatedUrl']
'did-frame-finish-load': ['isMainFrame'] 'did-frame-finish-load': ['isMainFrame']
'did-start-loading': [] 'did-start-loading': []
'did-stop-loading': [] 'did-stop-loading': []

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

@ -32,6 +32,7 @@ Returns:
* `event` Event * `event` Event
* `errorCode` Integer * `errorCode` Integer
* `errorDescription` String * `errorDescription` String
* `validatedUrl` String
This event is like `did-finish-load` but emitted when the load failed or was This event is like `did-finish-load` but emitted when the load failed or was
cancelled, e.g. `window.stop()` is invoked. cancelled, e.g. `window.stop()` is invoked.

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

@ -384,6 +384,7 @@ Returns:
* `errorCode` Integer * `errorCode` Integer
* `errorDescription` String * `errorDescription` String
* `validatedUrl` String
This event is like `did-finish-load`, but fired when the load failed or was This event is like `did-finish-load`, but fired when the load failed or was
cancelled, e.g. `window.stop()` is invoked. cancelled, e.g. `window.stop()` is invoked.