if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/symphonyoss/SymphonyElectron into ELECTRON-93

Browse Source
This commit is contained in:
Kiran Niranjan 2017-07-11 20:06:02 +05:30
commit 38497102c3
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/notify/electron-notify.js
View File

@ -15,7 +15,7 @@ const electron = require('electron');
const app = electron.app; const app = electron.app;
const BrowserWindow = electron.BrowserWindow; const BrowserWindow = electron.BrowserWindow;
const ipc = electron.ipcMain; const ipc = electron.ipcMain;
const { isMac } = require('../utils/misc'); const { isMac, isNodeEnv } = require('../utils/misc');
const log = require('../log.js'); const log = require('../log.js');
const logLevels = require('../enums/logLevels.js'); const logLevels = require('../enums/logLevels.js');
@ -131,8 +131,8 @@ let config = {
acceptFirstMouse: true, acceptFirstMouse: true,
webPreferences: { webPreferences: {
preload: path.join(__dirname, 'electron-notify-preload.js'), preload: path.join(__dirname, 'electron-notify-preload.js'),
sandbox: true, sandbox: !isNodeEnv,
nodeIntegration: false nodeIntegration: isNodeEnv
} }
} }
} }

5
js/utils/misc.js
View File

@ -5,7 +5,10 @@ const isDevEnv = process.env.ELECTRON_DEV ?
const isMac = (process.platform === 'darwin'); const isMac = (process.platform === 'darwin');
const isNodeEnv = !!process.env.NODE_ENV;
module.exports = { module.exports = {
isDevEnv: isDevEnv, isDevEnv: isDevEnv,
isMac: isMac isMac: isMac,
isNodeEnv: isNodeEnv
}; };

5
js/windowMgr.js
View File

@ -19,6 +19,7 @@ const eventEmitter = require('./eventEmitter');
const throttle = require('./utils/throttle.js'); const throttle = require('./utils/throttle.js');
const { getConfigField, updateConfigField } = require('./config.js'); const { getConfigField, updateConfigField } = require('./config.js');
const { isNodeEnv } = require('./utils/misc');
//context menu //context menu
const contextMenu = require('./menus/contextMenu.js'); const contextMenu = require('./menus/contextMenu.js');
@ -80,8 +81,8 @@ function doCreateMainWindow(initialUrl, initialBounds) {
minHeight: MIN_HEIGHT, minHeight: MIN_HEIGHT,
alwaysOnTop: false, alwaysOnTop: false,
webPreferences: { webPreferences: {
sandbox: true, sandbox: !isNodeEnv,
nodeIntegration: false, nodeIntegration: isNodeEnv,
preload: preloadMainScript, preload: preloadMainScript,
} }
}; };