From 2b3a256647413774346b7421f7f31250a76b205b Mon Sep 17 00:00:00 2001 From: Alexandre Lacheze Date: Wed, 26 Jun 2019 06:03:23 +0200 Subject: [PATCH] docs: precise that node integration is enabled in natively opened window if nodeIntegrationInSubFrames is true (#18156) --- docs/api/breaking-changes.md | 2 +- docs/api/browser-window.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/api/breaking-changes.md b/docs/api/breaking-changes.md index 748778fe6159..e9d2cd1def5c 100644 --- a/docs/api/breaking-changes.md +++ b/docs/api/breaking-changes.md @@ -172,7 +172,7 @@ const w = new BrowserWindow({ ### `nativeWindowOpen` -Child windows opened with the `nativeWindowOpen` option will always have Node.js integration disabled. +Child windows opened with the `nativeWindowOpen` option will always have Node.js integration disabled, unless `nodeIntegrationInSubFrames` is `true. ### Privileged Schemes Registration diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md index 11d39e7d84d4..930f624ab0ef 100644 --- a/docs/api/browser-window.md +++ b/docs/api/browser-window.md @@ -256,7 +256,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`. enabled in web workers. Default is `false`. More about this can be found in [Multithreading](../tutorial/multithreading.md). * `nodeIntegrationInSubFrames` Boolean (optional) - Experimental option for - enabling Node.js support in sub-frames such as iframes. All your preloads will load for + enabling Node.js support in sub-frames such as iframes and child windows. All your preloads will load for every iframe, you can use `process.isMainFrame` to determine if you are in the main frame or not. * `preload` String (optional) - Specifies a script that will be loaded before other @@ -353,7 +353,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`. Console tab. * `nativeWindowOpen` Boolean (optional) - Whether to use native `window.open()`. Defaults to `false`. Child windows will always have node - integration disabled. **Note:** This option is currently + integration disabled unless `nodeIntegrationInSubFrames` is true. **Note:** This option is currently experimental. * `webviewTag` Boolean (optional) - Whether to enable the [`` tag](webview-tag.md). Defaults to `false`. **Note:** The