From 25c59230f181f2f55813529c98f27fede7c8b307 Mon Sep 17 00:00:00 2001 From: Vishwas Shashidhar Date: Thu, 3 May 2018 12:23:01 +0530 Subject: [PATCH] Revert "ELECTRON-430: Enable context isolation" (#355) --- js/aboutApp/index.js | 1 - js/basicAuth/index.js | 1 - js/desktopCapturer/index.js | 1 - js/notify/electron-notify.js | 1 - js/notify/settings/configure-notification-position.js | 1 - js/windowMgr.js | 1 - 6 files changed, 6 deletions(-) diff --git a/js/aboutApp/index.js b/js/aboutApp/index.js index b879ebef..43980d3e 100644 --- a/js/aboutApp/index.js +++ b/js/aboutApp/index.js @@ -20,7 +20,6 @@ let windowConfig = { titleBarStyle: true, resizable: false, webPreferences: { - contextIsolation: true, preload: path.join(__dirname, 'renderer.js'), sandbox: true, nodeIntegration: false diff --git a/js/basicAuth/index.js b/js/basicAuth/index.js index e509c006..6752e391 100644 --- a/js/basicAuth/index.js +++ b/js/basicAuth/index.js @@ -23,7 +23,6 @@ let windowConfig = { titleBarStyle: true, resizable: false, webPreferences: { - contextIsolation: true, preload: path.join(__dirname, 'renderer.js'), sandbox: true, nodeIntegration: false diff --git a/js/desktopCapturer/index.js b/js/desktopCapturer/index.js index 239f849e..f3cc4931 100644 --- a/js/desktopCapturer/index.js +++ b/js/desktopCapturer/index.js @@ -24,7 +24,6 @@ let windowConfig = { resizable: false, alwaysOnTop: true, webPreferences: { - contextIsolation: true, preload: path.join(__dirname, 'renderer.js'), sandbox: true, nodeIntegration: false diff --git a/js/notify/electron-notify.js b/js/notify/electron-notify.js index 65404e2e..024fbbb2 100644 --- a/js/notify/electron-notify.js +++ b/js/notify/electron-notify.js @@ -136,7 +136,6 @@ let config = { transparent: true, acceptFirstMouse: true, webPreferences: { - contextIsolation: true, preload: path.join(__dirname, 'electron-notify-preload.js'), sandbox: sandboxed, nodeIntegration: isNodeEnv diff --git a/js/notify/settings/configure-notification-position.js b/js/notify/settings/configure-notification-position.js index 822d54d0..7cc94f04 100644 --- a/js/notify/settings/configure-notification-position.js +++ b/js/notify/settings/configure-notification-position.js @@ -27,7 +27,6 @@ let windowConfig = { autoHideMenuBar: true, resizable: false, webPreferences: { - contextIsolation: true, preload: path.join(__dirname, 'configure-notification-position-preload.js'), sandbox: sandboxed, nodeIntegration: false diff --git a/js/windowMgr.js b/js/windowMgr.js index 6a822eb5..4e0de33d 100644 --- a/js/windowMgr.js +++ b/js/windowMgr.js @@ -140,7 +140,6 @@ function doCreateMainWindow(initialUrl, initialBounds, isCustomTitleBar) { alwaysOnTop: false, webPreferences: { sandbox: sandboxed, - contextIsolation: true, nodeIntegration: isNodeEnv, preload: preloadMainScript, nativeWindowOpen: true