Browse Source

Disable guest node integration when embedder has it disabled

Kevin Sawicki 9 years ago
parent
commit
eafe9c245b
1 changed files with 6 additions and 5 deletions
  1. 6 5
      lib/browser/guest-window-manager.js

+ 6 - 5
lib/browser/guest-window-manager.js

@@ -28,11 +28,6 @@ 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.getWebPreferences().nodeIntegration === false) {
-      options.webPreferences.nodeIntegration = false
-    }
   } else {
     // Or only inherit web-preferences if it is a webview.
     if (options.webPreferences == null) {
@@ -40,6 +35,12 @@ var mergeBrowserWindowOptions = function (embedder, options) {
     }
     mergeOptions(options.webPreferences, embedder.getWebPreferences())
   }
+
+  // Disable node integration on child window if disabled on parent window
+  if (embedder.getWebPreferences().nodeIntegration === false) {
+    options.webPreferences.nodeIntegration = false
+  }
+
   return options
 }