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

Merge branch 'master' of github.com:electron/electron into zh-cn-docs

Browse source
This commit is contained in:
x-yao 2016-12-26 12:03:00 +08:00
commit 6f2f3ed1ac
23 changed files with 50 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
atom/browser/ui/message_box_gtk.cc
View file

@ -5,6 +5,7 @@
#include "atom/browser/ui/message_box.h"
#include "atom/browser/browser.h"
#include "atom/browser/native_window_observer.h"
#include "atom/browser/native_window_views.h"
#include "atom/browser/unresponsive_suppressor.h"
#include "base/callback.h"
@ -25,7 +26,7 @@ namespace atom {
namespace {
class GtkMessageBox {
class GtkMessageBox : public NativeWindowObserver {
public:
GtkMessageBox(NativeWindow* parent_window,
MessageBoxType type,
@ -77,6 +78,7 @@ class GtkMessageBox {
// Parent window.
if (parent_) {
parent_->AddObserver(this);
parent_->SetEnabled(false);
libgtk2ui::SetGtkTransientForAura(dialog_, parent_->GetNativeWindow());
gtk_window_set_modal(GTK_WINDOW(dialog_), TRUE);
@ -85,8 +87,10 @@ class GtkMessageBox {
~GtkMessageBox() {
gtk_widget_destroy(dialog_);
if (parent_)
if (parent_) {
parent_->RemoveObserver(this);
parent_->SetEnabled(true);
}
}
GtkMessageType GetMessageType(MessageBoxType type) {
@ -144,6 +148,11 @@ class GtkMessageBox {
Show();
}
void OnWindowClosed() override {
parent_->RemoveObserver(this);
parent_ = nullptr;
}
CHROMEGTK_CALLBACK_1(GtkMessageBox, void, OnResponseDialog, int);
private:

2
docs-translations/es/README.md
View file

@ -24,7 +24,7 @@
### Elementos DOM personalizados:
* [Objeto `File`](../../docs/api/file-object.md)
* [Etiqueta `<webview>`](../../docs/api/web-view-tag.md)
* [Etiqueta `<webview>`](../../docs/api/webview-tag.md)
* [Función `window.open`](../../docs/api/window-open.md)
### Módulos del Proceso Principal:

2
docs-translations/fr-FR/README.md
View file

@ -43,7 +43,7 @@ dans la FAQ :
### Eléments DOM Personnalisés:
* [Objet `File`](api/file-object.md)
* [Tag `<webview>`](api/web-view-tag.md)
* [Tag `<webview>`](api/webview-tag.md)
* [Fonction `window.open`](api/window-open.md)
### Modules pour le Processus Principal :

2
docs-translations/it-IT/README.md
View file

@ -49,7 +49,7 @@ sezione prima di creare una issue:
### Elementi personalizzati DOM:
* [Oggetto `File`](api/oggetto-file.md)
* [Tag `<webview>`](api/web-view-tag.md)
* [Tag `<webview>`](api/webview-tag.md)
* [Funzione `window.open`](api/window-open.md)
### Moduli per il Processo Main:

2
docs-translations/jp/README.md
View file

@ -44,7 +44,7 @@ _リンクになっていないリストは未翻訳のものです。_
### カスタムDOM要素:
* [`File` Object](api/file-object.md)
* [`<webview>` タグ](api/web-view-tag.md)
* [`<webview>` タグ](api/webview-tag.md)
* [`window.open` 関数](api/window-open.md)
### Main Processのモジュール:

6
docs-translations/jp/api/web-view-tag.md → docs-translations/jp/api/webview-tag.md
View file

@ -396,11 +396,11 @@ Executes editing command `undo` in page.
* `wordStart` Boolean - ワード始まりからの検索かを指定します。省略時は`false`で、語途中でもマッチします。
* `medialCapitalAsWordStart` Boolean - `wordStart`指定時、CamelCaseの途中もワード始まりと見なすかを指定します。省略時は`false`です。
`text`をページ内全てから検索し、リクエストに使用するリクエストID(`Integer`)を返します。リクエストの結果は、[`found-in-page`](web-view-tag.md#event-found-in-page)イベントを介して受け取ることができます。
`text`をページ内全てから検索し、リクエストに使用するリクエストID(`Integer`)を返します。リクエストの結果は、[`found-in-page`](webview-tag.md#event-found-in-page)イベントを介して受け取ることができます。
### `<webview>.stopFindInPage(action)`
* `action` String - [`<webview>.findInPage`](web-view-tag.md#webviewtagfindinpage)リクエストを終わらせる時にとるアクションを指定します。
* `action` String - [`<webview>.findInPage`](webview-tag.md#webviewtagfindinpage)リクエストを終わらせる時にとるアクションを指定します。
* `clearSelection` - 選択をクリアします。
* `keepSelection` - 選択を通常の選択へと変換します。
* `activateSelection` - 選択ノードにフォーカスを当て、クリックします。
@ -573,7 +573,7 @@ webview.addEventListener('console-message', (e) => {
* `matches` Integer (optional) - マッチした数です。
* `selectionArea` Object (optional) - 最初のマッチした場所です。
[`webview.findInPage`](web-view-tag.md#webviewtagfindinpage)リクエストで結果が得られた場合に発生します。
[`webview.findInPage`](webview-tag.md#webviewtagfindinpage)リクエストで結果が得られた場合に発生します。
```javascript
webview.addEventListener('found-in-page', (e) => {

2
docs-translations/ko-KR/README.md
View file

@ -51,7 +51,7 @@ Electron에 대해 자주 묻는 질문이 있습니다. 이슈를 생성하기
### 커스텀 DOM 요소:
* [`File` 객체](api/file-object.md)
* [`<webview>` 태그](api/web-view-tag.md)
* [`<webview>` 태그](api/webview-tag.md)
* [`window.open` 함수](api/window-open.md)
### 메인 프로세스에서 사용할 수 있는 모듈:

4
docs-translations/ko-KR/api/web-view-tag.md → docs-translations/ko-KR/api/webview-tag.md
View file

@ -473,12 +473,12 @@ Returns `Boolean` - 게스트 페이지 음소거 여부.
웹 페이지에서 `text`에 일치하는 모든 대상을 찾는 요청을 시작하고 요청에 사용된 요청을
표현하는 `정수(integer)`를 반환합니다. 요청의 결과는
[`found-in-page`](web-view-tag.md#event-found-in-page) 이벤트를 통해 취득할 수
[`found-in-page`](webview-tag.md#event-found-in-page) 이벤트를 통해 취득할 수
있습니다.
### `webContents.stopFindInPage(action)`
* `action` String - [`<webview>.findInPage`](web-view-tag.md#webviewtagfindinpage)
* `action` String - [`<webview>.findInPage`](webview-tag.md#webviewtagfindinpage)
요청이 종료되었을 때 일어날 수 있는 작업을 지정합니다.
* `clearSelection` - 선택을 취소합니다.
* `keepSelection` - 선택을 일반 선택으로 변경합니다.

2
docs-translations/pt-BR/README.md
View file

@ -41,7 +41,7 @@ Existem muitas perguntas comuns que são feitas, verifique antes de criar uma is
### Elementos DOM Personalizados:
* [Objeto `File`](api/file-object.md)
* [Tag `<webview>`](../../docs/api/web-view-tag.md)
* [Tag `<webview>`](../../docs/api/webview-tag.md)
* [Função `window.open`](api/window-open.md)
### Módulos para o Processo Principal:

2
docs-translations/ru-RU/README.md
View file

@ -34,7 +34,7 @@
### Пользовательские элементы DOM:
* [`File` Object](api/file-object.md)
* [`<webview>` Tag](api/web-view-tag.md)
* [`<webview>` Tag](api/webview-tag.md)
* [`window.open` Function](api/window-open.md)
### Модули для Main Process:

2
docs-translations/th-TH/README.md
View file

@ -25,7 +25,7 @@
### การปรับแต่ง DOM:
* [วัตถุ `File`](api/file-object.md)
* [แท็ก `<webview>`](api/web-view-tag.md)
* [แท็ก `<webview>`](api/webview-tag.md)
* [ฟังก์ชัน `window.open`](api/window-open.md)
### โมดูลสำหรับกระบวนการหลัก :

2
docs-translations/tr-TR/README.md
View file

@ -37,7 +37,7 @@ Bir problem(issue) bildirmeden önce sıkça sorulan sorulara göz atın:
### Özel DOM Elementleri:
* [`File` Nesnesi](api/file-object.md)
* [`<webview>` Etiketi](https://github.com/electron/electron/tree/master/docs/api/web-view-tag.md)
* [`<webview>` Etiketi](https://github.com/electron/electron/tree/master/docs/api/webview-tag.md)
* [`window.open` Fonksiyonu](https://github.com/electron/electron/tree/master/docs/api/window-open.md)
### Ana Süreç(Main Process) Modülleri:

2
docs-translations/uk-UA/README.md
View file

@ -36,7 +36,7 @@
### Користувальницькі елементи DOM
* [`File` Object](api/file-object.md)
* [`<webview>` Tag](api/web-view-tag.md)
* [`<webview>` Tag](api/webview-tag.md)
* [`window.open` Function](api/window-open.md)
### Модулі для Main Process:

2
docs-translations/zh-CN/README.md
View file

@ -43,7 +43,7 @@
### 自定义的 DOM 元素:
* [`File` 对象](api/file-object.md)
* [`<webview>` 标签](api/web-view-tag.md)
* [`<webview>` 标签](api/webview-tag.md)
* [`window.open` 函数](api/window-open.md)
### 在主进程内可用的模块:

6
docs-translations/zh-CN/api/web-view-tag.md → docs-translations/zh-CN/api/webview-tag.md
View file

@ -359,12 +359,12 @@ guest page 导航到指定的相对位置.
默认为 `false`.
* `medialCapitalAsWordStart` Boolean - 当配合 `wordStart`的时候,接受一个文字中的匹配项，要求匹配项是以大写字母开头后面跟小写字母或者没有字母。可以接受一些其他单词内部匹配, 默认为 `false`.
发起一个请求来寻找页面中的所有匹配 `text` 的地方并且返回一个 `Integer`来表示这个请求用的请求Id. 这个请求结果可以通过订阅[`found-in-page`](web-view-tag.md#event-found-in-page) 事件来取得.
发起一个请求来寻找页面中的所有匹配 `text` 的地方并且返回一个 `Integer`来表示这个请求用的请求Id. 这个请求结果可以通过订阅[`found-in-page`](webview-tag.md#event-found-in-page) 事件来取得.
### `<webview>.stopFindInPage(action)`
* `action` String - 指定一个行为来接替停止
[`<webview>.findInPage`](web-view-tag.md#webviewtagfindinpage) 请求.
[`<webview>.findInPage`](webview-tag.md#webviewtagfindinpage) 请求.
* `clearSelection` - 转变为一个普通的 selection.
* `keepSelection` - 清除 selection.
* `activateSelection` - 聚焦并点击 selection node.
@ -533,7 +533,7 @@ webview.addEventListener('console-message', function (e) {
* `matches` Integer (optional) - 匹配数量.
* `selectionArea` Object (optional) - 整合第一个匹配域.
在请求[`webview.findInPage`](web-view-tag.md#webviewtagfindinpage)结果有效时触发.
在请求[`webview.findInPage`](webview-tag.md#webviewtagfindinpage)结果有效时触发.
```javascript
webview.addEventListener('found-in-page', function (e) {

2
docs-translations/zh-TW/README.md
View file

@ -25,7 +25,7 @@
客製的 DOM 元素:
* [`File`物件](api/file-object.md)
* [`<webview>`物件](api/web-view-tag.md)
* [`<webview>`物件](api/webview-tag.md)
* [`window.open`函數](api/window-open.md)
主行程可用的模組:

2
docs/README.md
View file

@ -50,7 +50,7 @@ an issue:
### Custom DOM Elements:
* [`File` Object](api/file-object.md)
* [`<webview>` Tag](api/web-view-tag.md)
* [`<webview>` Tag](api/webview-tag.md)
* [`window.open` Function](api/window-open.md)
### Modules for the Main Process:

23
docs/api/environment-variables.md
View file

@ -46,14 +46,23 @@ geocoding requests. To enable geocoding requests, visit [this page](https://cons
Disables ASAR support. This variable is only supported in forked child processes
and spawned child processes that set `ELECTRON_RUN_AS_NODE`.
### `ELECTRON_RUN_AS_NODE`
Starts the process as a normal Node.js process.
### `ELECTRON_NO_ATTACH_CONSOLE` _Windows_
Don't attach to the current console session.
### `ELECTRON_FORCE_WINDOW_MENU_BAR` _Linux_
Don't use the global menu bar on Linux.
## Development Variables
The following environment variables are intended primarily for development and
debugging purposes.
### `ELECTRON_RUN_AS_NODE`
Starts the process as a normal Node.js process.
### `ELECTRON_ENABLE_LOGGING`
@ -76,11 +85,3 @@ This environment variable will not work if the `crashReporter` is started.
Shows the Windows's crash dialog when Electron crashes.
This environment variable will not work if the `crashReporter` is started.
### `ELECTRON_NO_ATTACH_CONSOLE` _Windows_
Don't attach to the current console session.
### `ELECTRON_FORCE_WINDOW_MENU_BAR` _Linux_
Don't use the global menu bar on Linux.

2
docs/api/session.md
View file

@ -112,7 +112,7 @@ Clears the session’s HTTP cache.
* `origin` String - Should follow `window.location.origin`’s representation
`scheme://host:port`.
* `storages` String[] - The types of storages to clear, can contain:
`appcache`, `cookies`, `filesystem`, `indexdb`, `local storage`,
`appcache`, `cookies`, `filesystem`, `indexdb`, `localstorage`,
`shadercache`, `websql`, `serviceworkers`
* `quotas` String[] - The types of quotas to clear, can contain:
`temporary`, `persistent`, `syncable`.

6
docs/api/web-view-tag.md → docs/api/webview-tag.md
View file

@ -515,12 +515,12 @@ Inserts `text` to the focused element.
Starts a request to find all matches for the `text` in the web page and returns an `Integer`
representing the request id used for the request. The result of the request can be
obtained by subscribing to [`found-in-page`](web-view-tag.md#event-found-in-page) event.
obtained by subscribing to [`found-in-page`](webview-tag.md#event-found-in-page) event.
### `<webview>.stopFindInPage(action)`
* `action` String - Specifies the action to take place when ending
[`<webview>.findInPage`](web-view-tag.md#webviewtagfindinpage) request.
[`<webview>.findInPage`](webview-tag.md#webviewtagfindinpage) request.
* `clearSelection` - Clear the selection.
* `keepSelection` - Translate the selection into a normal selection.
* `activateSelection` - Focus and click the selection node.
@ -720,7 +720,7 @@ Returns:
* `selectionArea` Object - Coordinates of first match region.
Fired when a result is available for
[`webview.findInPage`](web-view-tag.md#webviewtagfindinpage) request.
[`webview.findInPage`](webview-tag.md#webviewtagfindinpage) request.
```javascript
const webview = document.getElementById('foo')

2
docs/tutorial/about.md
View file

@ -6,7 +6,7 @@ Electron began in 2013 as the framework on which [Atom](https://atom.io), GitHub
It has since become a popular tool used by open source developers, startups, and established companies. [See who is building on Electron](/apps).
Read on to learn more about the contributors and releases of Electron or get started building with Electron in the [Quick Start Guide](../quick-start).
Read on to learn more about the contributors and releases of Electron or get started building with Electron in the [Quick Start Guide](quick-start.md).
## Core Team and Contributors

13
spec/fixtures/pages/web-view-log-process.html vendored
View file

@ -1,13 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>test</title>
<script>
console.log(typeof process)
</script>
</head>
<body>
test?
</body>
</html>

2
spec/webview-spec.js
View file

@ -6,7 +6,7 @@ const {app, session, getGuestWebContents, ipcMain, BrowserWindow, webContents} =
const {closeWindow} = require('./window-helpers')
describe('<webview> tag', function () {
this.timeout(60000)
this.timeout(3 * 60 * 1000)
var fixtures = path.join(__dirname, 'fixtures')