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

reverted incorrect changes

Browse source
This commit is contained in:
Joseph Dykstra 2015-03-27 07:46:26 -05:00
parent b6875ad49b
commit 4a508e0e41
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
docs/api/browser-window.md
View file

@ -241,7 +241,7 @@ Get the unique ID of this window.
### BrowserWindow.destroy() ### BrowserWindow.destroy()
Force closing the window, the `unload` and `beforeunload` event won't be emitted Force closing the window, the `unload` and `beforeunload` event won't be emitted
for the renderer process (web page), and `close` event would also not be emitted for the web page, and `close` event would also not be emitted
for this window, but it would guarantee the `closed` event to be emitted. for this window, but it would guarantee the `closed` event to be emitted.
You should only use this method when the renderer process (web page) has crashed. You should only use this method when the renderer process (web page) has crashed.
@ -249,8 +249,8 @@ You should only use this method when the renderer process (web page) has crashed
### BrowserWindow.close() ### BrowserWindow.close()
Try to close the window, this has the same effect with user manually clicking Try to close the window, this has the same effect with user manually clicking
the close button of the window. The renderer process (web page) may cancel the the close button of the window. The web page may cancel the close though, see
close though, see the [close event](window#event-close). the [close event](window#event-close).
### BrowserWindow.focus() ### BrowserWindow.focus()
@ -327,11 +327,11 @@ Returns an array that contains window's width and height.
* `width` Integer * `width` Integer
* `height` Integer * `height` Integer
Resizes the renderer's area (i.e. the web page) to `width` and `height`. Resizes the window's client area (e.g. the web page) to `width` and `height`.
### BrowserWindow.getContentSize() ### BrowserWindow.getContentSize()
Returns an array that contains the renderer's width and height. Returns an array that contains window's client area's width and height.
### BrowserWindow.setMinimumSize(width, height) ### BrowserWindow.setMinimumSize(width, height)

2
docs/api/ipc-main-process.md
View file

@ -46,4 +46,4 @@ Assign to this to return an value to synchronous messages.
### Event.sender ### Event.sender
The `WebContents` of the renderer that has sent the message. The `WebContents` that sent the message.

5
docs/tutorial/quick-start.md
View file

@ -13,10 +13,9 @@ Chromium browser, controlled by JavaScript.
### The main process ### The main process
The main atom-shell process displays a GUI by showing web pages. We have The main atom-shell process displays a GUI by creating web pages. We have
**scripts that run in the atom-shell runtime**, that create **scripts **scripts that run in the atom-shell runtime**, that create **scripts
that run in the web page**. We call them **main process scripts**, that run in the web page**.
and **renderer process scripts**.
In atom-shell, we have provided the [ipc](../api/ipc-renderer.md) module for In atom-shell, we have provided the [ipc](../api/ipc-renderer.md) module for
communication from the main process to the renderer process, and the communication from the main process to the renderer process, and the