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

Rename select-certificate to select-client-certificate

Browse source
This commit is contained in:
Cheng Zhao 2015-11-18 10:10:21 +08:00
parent 9a0dc3bfd7
commit 341341bf28
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -247,7 +247,7 @@ void App::SelectClientCertificate(
std::shared_ptr<content::ClientCertificateDelegate> std::shared_ptr<content::ClientCertificateDelegate>
shared_delegate(delegate.release()); shared_delegate(delegate.release());
bool prevent_default = bool prevent_default =
Emit("select-certificate", Emit("select-client-certificate",
api::WebContents::CreateFrom(isolate(), web_contents), api::WebContents::CreateFrom(isolate(), web_contents),
cert_request_info->host_and_port.ToString(), cert_request_info->host_and_port.ToString(),
cert_request_info->client_certs, cert_request_info->client_certs,

1
atom/browser/api/lib/app.coffee
View file

@ -52,6 +52,7 @@ deprecate.event app, 'finish-launching', 'ready', ->
@emit 'finish-launching' @emit 'finish-launching'
deprecate.event app, 'activate-with-no-open-windows', 'activate', (event, hasVisibleWindows) -> deprecate.event app, 'activate-with-no-open-windows', 'activate', (event, hasVisibleWindows) ->
@emit 'activate-with-no-open-windows' if not hasVisibleWindows @emit 'activate-with-no-open-windows' if not hasVisibleWindows
deprecate.event app, 'select-certificate', 'select-client-certificate'
# Wrappers for native classes. # Wrappers for native classes.
wrapSession = (session) -> wrapSession = (session) ->

4
docs/api/app.md
View file

@ -131,7 +131,7 @@ Returns:
Emitted when a new [browserWindow](browser-window.md) is created. Emitted when a new [browserWindow](browser-window.md) is created.
### Event: 'select-certificate' ### Event: 'select-client-certificate'
Returns: Returns:
@ -151,7 +151,7 @@ and `callback` needs to be called with an entry filtered from the list. Using
certificate from the store. certificate from the store.
```javascript ```javascript
app.on('select-certificate', function(event, host, url, list, callback) { app.on('select-client-certificate', function(event, webContents, url, list, callback) {
event.preventDefault(); event.preventDefault();
callback(list[0]); callback(list[0]);
}) })