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

Make browser window optional

Browse source
This commit is contained in:
Kevin Sawicki 2017-04-04 10:49:10 -07:00
parent 2749ded062
commit 2e32525e8f
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
docs/api/dialog.md
View file

@ -175,9 +175,9 @@ it is usually used to report errors in early stage of startup. If called
before the app `ready`event on Linux, the message will be emitted to stderr, before the app `ready`event on Linux, the message will be emitted to stderr,
and no GUI dialog will appear. and no GUI dialog will appear.
### `dialog.showCertificateTrustDialog(browserWindow, options, callback)` _macOS_ ### `dialog.showCertificateTrustDialog([browserWindow, ]options, callback)` _macOS_
* `browserWindow` BrowserWindow * `browserWindow` BrowserWindow (optional)
* `options` Object * `options` Object
* `certificate` [Certificate](structures/certificate.md) - The certificate to trust/import. * `certificate` [Certificate](structures/certificate.md) - The certificate to trust/import.
* `message` String - The message to display to the user. * `message` String - The message to display to the user.
@ -186,6 +186,9 @@ and no GUI dialog will appear.
Displays a modal dialog that shows a message and certificate information, and Displays a modal dialog that shows a message and certificate information, and
gives the user the option of trusting/importing the certificate. gives the user the option of trusting/importing the certificate.
The `browserWindow` argument allows the dialog to attach itself to a parent
window, making it modal.
## Sheets ## Sheets
On macOS, dialogs are presented as sheets attached to a window if you provide On macOS, dialogs are presented as sheets attached to a window if you provide

4
lib/browser/api/dialog.js
View file

@ -282,7 +282,9 @@ module.exports = {
return binding.showErrorBox(...args) return binding.showErrorBox(...args)
}, },
showCertificateTrustDialog: function (window, options, callback) { showCertificateTrustDialog: function (...args) {
let [window, options, callback] = parseArgs(...args)
if (options == null || typeof options !== 'object') { if (options == null || typeof options !== 'object') {
throw new TypeError('options must be an object') throw new TypeError('options must be an object')
} }