Skip to content

Commit 228ad7e

Browse files
committed
electron seems happy
1 parent b74fedd commit 228ad7e

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

web/biselectron.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ let getTime = function() {
4040
// -------------------------------------------------------------------------------
4141

4242
const electron = require('electron');
43-
require('@electron/remote/main').initialize();
43+
const remoteMain = require('@electron/remote/main');
44+
remoteMain.initialize();
4445
require('electron-debug')({showDevTools: false,
4546
enabled : true});
4647

@@ -273,11 +274,12 @@ const createWindow=function(index,fullURL) {
273274
nodeIntegration: false,
274275
preload: preload,
275276
contextIsolation: false,
276-
enableRemoteModule : true,
277+
sandbox: false,
277278
},
278279
autoHideMenuBar : true,
279280
icon: __dirname+'/images/favicon.ico'});
280-
281+
282+
remoteMain.enable(state.winlist[index].webContents);
281283
//state.winlist[index].setAutoHideMenuBar(true);
282284
state.winlist[index].setMenuBarVisibility(false);
283285
if (process.platform === 'darwin')

web/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"description": "The Electron version of BioImageSuite Web",
1212
"main": "biselectron.js",
1313
"dependencies": {
14-
"@electron/remote": "1.0.2",
14+
"@electron/remote": "2.1.2",
1515
"commander": "2.16.0",
1616
"colors": "1.1.2",
17-
"electron-debug": "1.5.0",
18-
"glob": "^7.1.1",
17+
"electron-debug": "3.2.0",
18+
"glob": "7.1.6",
1919
"rimraf": "2.6.2"
2020
}
2121
}

0 commit comments

Comments
 (0)