From 341341bf28178481cfc17262395d94f7af7f5c98 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Wed, 18 Nov 2015 10:10:21 +0800 Subject: [PATCH] Rename select-certificate to select-client-certificate --- atom/browser/api/atom_api_app.cc | 2 +- atom/browser/api/lib/app.coffee | 1 + docs/api/app.md | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/atom/browser/api/atom_api_app.cc b/atom/browser/api/atom_api_app.cc index b1efea5..95db0c6 100644 --- a/atom/browser/api/atom_api_app.cc +++ b/atom/browser/api/atom_api_app.cc @@ -247,7 +247,7 @@ void App::SelectClientCertificate( std::shared_ptr shared_delegate(delegate.release()); bool prevent_default = - Emit("select-certificate", + Emit("select-client-certificate", api::WebContents::CreateFrom(isolate(), web_contents), cert_request_info->host_and_port.ToString(), cert_request_info->client_certs, diff --git a/atom/browser/api/lib/app.coffee b/atom/browser/api/lib/app.coffee index f8d3ced..44efaa2 100644 --- a/atom/browser/api/lib/app.coffee +++ b/atom/browser/api/lib/app.coffee @@ -52,6 +52,7 @@ deprecate.event app, 'finish-launching', 'ready', -> @emit 'finish-launching' deprecate.event app, 'activate-with-no-open-windows', 'activate', (event, hasVisibleWindows) -> @emit 'activate-with-no-open-windows' if not hasVisibleWindows +deprecate.event app, 'select-certificate', 'select-client-certificate' # Wrappers for native classes. wrapSession = (session) -> diff --git a/docs/api/app.md b/docs/api/app.md index e1a4cbf..4ff90f3 100644 --- a/docs/api/app.md +++ b/docs/api/app.md @@ -131,7 +131,7 @@ Returns: Emitted when a new [browserWindow](browser-window.md) is created. -### Event: 'select-certificate' +### Event: 'select-client-certificate' Returns: @@ -151,7 +151,7 @@ and `callback` needs to be called with an entry filtered from the list. Using certificate from the store. ```javascript -app.on('select-certificate', function(event, host, url, list, callback) { +app.on('select-client-certificate', function(event, webContents, url, list, callback) { event.preventDefault(); callback(list[0]); }) -- 2.7.4