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

Merge pull request #6985 from electron/more-parameter-fixes

Browse source 
More parameter fixes
This commit is contained in:
Zeke Sikelianos 2016-08-25 17:28:36 -07:00 committed by GitHub
commit 34e0f8c644
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/api/shell.md
View file

@ -78,7 +78,9 @@ returned, otherwise `false` is returned.
### `shell.readShortcutLink(shortcutPath)` _Windows_ ### `shell.readShortcutLink(shortcutPath)` _Windows_
Resolves the shortcut link at `shortcutPath`, an object is returned with the * `shortcutPath` String
Resolves the shortcut link at `shortcutPath`. An object is returned with the
fields described in the `options` of `shell.writeShortcutLink`. fields described in the `options` of `shell.writeShortcutLink`.
An exception will be thrown when any error happens. An exception will be thrown when any error happens.

8
docs/api/tray.md
View file

@ -185,11 +185,11 @@ Sets the title displayed aside of the tray icon in the status bar.
#### `tray.setHighlightMode(mode)` _macOS_ #### `tray.setHighlightMode(mode)` _macOS_
* `mode` String highlight mode with one of the following values: * `mode` String - Highlight mode with one of the following values:
* `'selection'` - Highlight the tray icon when it is clicked and also when * `selection` - Highlight the tray icon when it is clicked and also when
its context menu is open. This is the default. its context menu is open. This is the default.
* `'always'` - Always highlight the tray icon. * `always` - Always highlight the tray icon.
* `'never'` - Never highlight the tray icon. * `never` - Never highlight the tray icon.
Sets when the tray's icon background becomes highlighted (in blue). Sets when the tray's icon background becomes highlighted (in blue).

4
docs/api/web-contents.md
View file

@ -696,7 +696,7 @@ Executes the editing command `cut` in web page.
Executes the editing command `copy` in web page. Executes the editing command `copy` in web page.
### `contents.copyImageAt(x, y)` #### `contents.copyImageAt(x, y)`
* `x` Integer * `x` Integer
* `y` Integer * `y` Integer
@ -1128,6 +1128,8 @@ If *offscreen rendering* is enabled returns whether it is currently painting.
#### `contents.setFrameRate(fps)` #### `contents.setFrameRate(fps)`
* `fps` Integer
If *offscreen rendering* is enabled sets the frame rate to the specified number. If *offscreen rendering* is enabled sets the frame rate to the specified number.
Only values between 1 and 60 are accepted. Only values between 1 and 60 are accepted.

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

@ -38,6 +38,8 @@ origin preference.
## Class: BrowserWindowProxy ## Class: BrowserWindowProxy
> Manipulate the child browser window
The `BrowserWindowProxy` object is returned from `window.open` and provides The `BrowserWindowProxy` object is returned from `window.open` and provides
limited functionality with the child window. limited functionality with the child window.