Merge pull request #340 from VikasShashidhar/Electron-430

ELECTRON-430: Enable context isolation
This commit is contained in:
Vikas Shashidhar 2018-05-03 12:09:20 +05:30 committed by GitHub
commit 77999b3a87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 0 deletions

View File

@ -20,6 +20,7 @@ let windowConfig = {
titleBarStyle: true, titleBarStyle: true,
resizable: false, resizable: false,
webPreferences: { webPreferences: {
contextIsolation: true,
preload: path.join(__dirname, 'renderer.js'), preload: path.join(__dirname, 'renderer.js'),
sandbox: true, sandbox: true,
nodeIntegration: false nodeIntegration: false

View File

@ -23,6 +23,7 @@ let windowConfig = {
titleBarStyle: true, titleBarStyle: true,
resizable: false, resizable: false,
webPreferences: { webPreferences: {
contextIsolation: true,
preload: path.join(__dirname, 'renderer.js'), preload: path.join(__dirname, 'renderer.js'),
sandbox: true, sandbox: true,
nodeIntegration: false nodeIntegration: false

View File

@ -24,6 +24,7 @@ let windowConfig = {
resizable: false, resizable: false,
alwaysOnTop: true, alwaysOnTop: true,
webPreferences: { webPreferences: {
contextIsolation: true,
preload: path.join(__dirname, 'renderer.js'), preload: path.join(__dirname, 'renderer.js'),
sandbox: true, sandbox: true,
nodeIntegration: false nodeIntegration: false

View File

@ -136,6 +136,7 @@ let config = {
transparent: true, transparent: true,
acceptFirstMouse: true, acceptFirstMouse: true,
webPreferences: { webPreferences: {
contextIsolation: true,
preload: path.join(__dirname, 'electron-notify-preload.js'), preload: path.join(__dirname, 'electron-notify-preload.js'),
sandbox: sandboxed, sandbox: sandboxed,
nodeIntegration: isNodeEnv nodeIntegration: isNodeEnv

View File

@ -27,6 +27,7 @@ let windowConfig = {
autoHideMenuBar: true, autoHideMenuBar: true,
resizable: false, resizable: false,
webPreferences: { webPreferences: {
contextIsolation: true,
preload: path.join(__dirname, 'configure-notification-position-preload.js'), preload: path.join(__dirname, 'configure-notification-position-preload.js'),
sandbox: sandboxed, sandbox: sandboxed,
nodeIntegration: false nodeIntegration: false

View File

@ -140,6 +140,7 @@ function doCreateMainWindow(initialUrl, initialBounds, isCustomTitleBar) {
alwaysOnTop: false, alwaysOnTop: false,
webPreferences: { webPreferences: {
sandbox: sandboxed, sandbox: sandboxed,
contextIsolation: true,
nodeIntegration: isNodeEnv, nodeIntegration: isNodeEnv,
preload: preloadMainScript, preload: preloadMainScript,
nativeWindowOpen: true nativeWindowOpen: true