github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Disable node on child when disabled on parent

Browse Source
This commit is contained in:
Kevin Sawicki
2016-03-23 17:36:26 -07:00
parent 777704e659
commit 463e077c3a
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/browser/guest-window-manager.js
View File

@@ -28,6 +28,11 @@ var mergeBrowserWindowOptions = function (embedder, options) {
if (embedder.browserWindowOptions != null) {
// Inherit the original options if it is a BrowserWindow.
mergeOptions(options, embedder.browserWindowOptions)
// Disable node integration on child window if disabled on parent window
if (!embedder.browserWindowOptions.webPreferences.nodeIntegration) {
options.webPreferences.nodeIntegration = false
}
} else {
// Or only inherit web-preferences if it is a webview.
if (options.webPreferences == null) {