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

Merge pull request #9425 from electron/typescript-duplicates

Browse source 
Minor typescript fixes
This commit is contained in:
Kevin Sawicki 2017-05-10 16:25:18 -07:00 • committed by GitHub
commit ad5424f886
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
docs/api/browser-view.md
View file

@ -57,10 +57,10 @@ Objects created with `new BrowserWindow` have the following instance methods:
#### `win.setAutoResize(options)` _Experimental_ #### `win.setAutoResize(options)` _Experimental_
* `options` Object * `options` Object
* `width`: If `true`, the view's width will grow and shrink together with * `width` Boolean - If `true`, the view's width will grow and shrink together
the window. `false` by default. with the window. `false` by default.
* `height`: If `true`, the view's height will grow and shrink together with * `height` Boolean - If `true`, the view's height will grow and shrink
the window. `false` by default. together with the window. `false` by default.
#### `win.setBounds(bounds)` _Experimental_ #### `win.setBounds(bounds)` _Experimental_

2
docs/api/structures/memory-info.md
View file

@ -1,6 +1,6 @@
# MemoryInfo Object # MemoryInfo Object
* `workingSetSize` Integer - Process id of the process. * `pid` Integer - Process id of the process.
* `workingSetSize` Integer - The amount of memory currently pinned to actual physical RAM. * `workingSetSize` Integer - The amount of memory currently pinned to actual physical RAM.
* `peakWorkingSetSize` Integer - The maximum amount of memory that has ever been pinned * `peakWorkingSetSize` Integer - The maximum amount of memory that has ever been pinned
to actual physical RAM. to actual physical RAM.