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

Merge pull request #8078 from electron/dts-docs-update-again

Browse source 
Update Docs
This commit is contained in:
Kevin Sawicki 2016-12-21 13:39:53 -08:00 • committed by GitHub
commit f99dabbac6
14 changed files with 66 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/api/app.md
View file

@ -189,7 +189,7 @@ Returns:
* `event` Event
* `webContents` [WebContents](web-contents.md)
* `url` URL
* `url` String
* `error` String - The error code
* `certificate` [Certificate](structures/certificate.md)
* `callback` Function
@ -845,7 +845,7 @@ When `informational` is passed, the dock icon will bounce for one second.
However, the request remains active until either the application becomes active
or the request is canceled.
Returns an ID representing the request.
Returns `Integer` an ID representing the request.
### `app.dock.cancelBounce(id)` _macOS_
@ -891,7 +891,7 @@ Sets the application's [dock menu][dock-menu].
### `app.dock.setIcon(image)` _macOS_
* `image` [NativeImage](native-image.md)
* `image` ([NativeImage](native-image.md) | String)
Sets the `image` associated with this dock icon.