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

Merge pull request #1604 from deepak1556/contents_event_patch

Browse source 
webContents: providing response headers in did-get-response-details event
This commit is contained in:
Cheng Zhao 2015-05-20 19:08:54 +08:00
commit 6f806190b6
4 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,6 +37,7 @@
#include "native_mate/callback.h" #include "native_mate/callback.h"
#include "native_mate/dictionary.h" #include "native_mate/dictionary.h"
#include "native_mate/object_template_builder.h" #include "native_mate/object_template_builder.h"
#include "net/url_request/url_request_context.h"
#include "atom/common/node_includes.h" #include "atom/common/node_includes.h"
@ -278,13 +279,20 @@ void WebContents::DidStopLoading(content::RenderViewHost* render_view_host) {
void WebContents::DidGetResourceResponseStart( void WebContents::DidGetResourceResponseStart(
const content::ResourceRequestDetails& details) { const content::ResourceRequestDetails& details) {
auto context = static_cast<brightray::BrowserContext*>(
web_contents()->GetBrowserContext());
std::string headers;
if (context)
headers = context->GetNetworkDelegate()->GetResponseHeaders(details.url);
Emit("did-get-response-details", Emit("did-get-response-details",
details.socket_address.IsEmpty(), details.socket_address.IsEmpty(),
details.url, details.url,
details.original_url, details.original_url,
details.http_response_code, details.http_response_code,
details.method, details.method,
details.referrer); details.referrer,
headers);
} }
void WebContents::DidGetRedirectForResourceRequest( void WebContents::DidGetRedirectForResourceRequest(

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

@ -10,7 +10,8 @@ WEB_VIEW_EVENTS =
'did-start-loading': [] 'did-start-loading': []
'did-stop-loading': [] 'did-stop-loading': []
'did-get-response-details': ['status', 'newUrl', 'originalUrl', 'did-get-response-details': ['status', 'newUrl', 'originalUrl',
'httpResponseCode', 'requestMethod', 'referrer'] 'httpResponseCode', 'requestMethod', 'referrer',
'headers']
'did-get-redirect-request': ['oldUrl', 'newUrl', 'isMainFrame'] 'did-get-redirect-request': ['oldUrl', 'newUrl', 'isMainFrame']
'dom-ready': [] 'dom-ready': []
'console-message': ['level', 'message', 'line', 'sourceId'] 'console-message': ['level', 'message', 'line', 'sourceId']

2
docs/api/browser-window.md
View file

@ -666,9 +666,11 @@ Corresponds to the points in time when the spinner of the tab stops spinning.
* `httpResponseCode` Integer * `httpResponseCode` Integer
* `requestMethod` String * `requestMethod` String
* `referrer` String * `referrer` String
* `headers` String
Emitted when details regarding a requested resource is available. Emitted when details regarding a requested resource is available.
`status` indicates the socket connection to download the resource. `status` indicates the socket connection to download the resource.
`headers` is key-value string separated by new-line character.
### Event: 'did-get-redirect-request' ### Event: 'did-get-redirect-request'

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

@ -325,9 +325,11 @@ Corresponds to the points in time when the spinner of the tab stops spinning.
* `httpResponseCode` Integer * `httpResponseCode` Integer
* `requestMethod` String * `requestMethod` String
* `referrer` String * `referrer` String
* `headers` String
Fired when details regarding a requested resource is available. Fired when details regarding a requested resource is available.
`status` indicates socket connection to download the resource. `status` indicates socket connection to download the resource.
`headers` is key-value string separated by new-line character.
### did-get-redirect-request ### did-get-redirect-request