diff --git a/elever/main.js b/elever/main.js index 3a93b5aade3a40d37e7d9eaf544a18e89dd02c72..ef57995d73f699f14a9f2c1c25efc11f7f36059b 100644 --- a/elever/main.js +++ b/elever/main.js @@ -5,7 +5,6 @@ const app = electron.app // Module to create native browser window. const BrowserWindow = electron.BrowserWindow - const path = require('path') const url = require('url') const {ipcMain} = require('electron'); @@ -24,7 +23,9 @@ function createWindow () // Create the browser window. mainWindow = new BrowserWindow({width: 800, height: 600, icon:path.join(__dirname,'..','leverjs/leverjs.ico'), webPreferences: { - nodeIntegration: true + nodeIntegration: true, + contextIsolation: false, + enableRemoteModule: true } }); diff --git a/leverjs/ImageWindowBuilder.js b/leverjs/ImageWindowBuilder.js index 823c266807047dcf949c9f4622482c09da2aa191..2c9cf23767bde48a14b6f0323001cf42f86edeb2 100644 --- a/leverjs/ImageWindowBuilder.js +++ b/leverjs/ImageWindowBuilder.js @@ -41,7 +41,8 @@ var miniMapmousedrag = false; // database is read only var gbReadOnlyDB=false; -const IS_NODE = typeof module !== 'undefined' && module.exports; +// const IS_NODE = typeof module !== 'undefined' && module.exports; +var IS_NODE = navigator.userAgent.indexOf('Electron') >= 0 // set to tell render.js (reDraw) not to kick off a multires if we're in the experiment window var gbExperimentRender=false; @@ -171,7 +172,7 @@ window.onload = function () { ROOT=params[1].slice('ROOT='.length) title=params[2].slice('TITLE='.length) - console.log('lever figure window found :: port='+port+" :: root="+root) + console.log('lever figure window found :: port='+port+" :: root="+ROOT) uiServer.init(port,window) document.title='leversc '+title setLeverscUI() diff --git a/leversc/src/MATLAB/@leversc/show.m b/leversc/src/MATLAB/@leversc/show.m index e6a01af93108cc582559f8e6e017a0793bcaf918..2ad1d3bec242fb393e668cc2f3708f2d0a6cd036 100644 --- a/leversc/src/MATLAB/@leversc/show.m +++ b/leversc/src/MATLAB/@leversc/show.m @@ -106,9 +106,19 @@ end function launch_electron_posix(port,fignum,workdir, leverpath,strDB) elec_cmd = 'leverjs'; +px = getenv('PATH'); if ( ~isempty(leverpath) ) - elec_path = fullfile(leverpath,'node_modules','.bin','electron'); - elec_cmd = [elec_path ' ' fullfile(leverpath,'elever','main.js')]; + % first try NVM + nvm_path = getenv('NVM_DIR'); + if ~isempty(nvm_path) + [ret,elec_path] = system('source ~/.nvm/nvm.sh;which electron'); + elec_path = replace(elec_path,newline,''); + nodePath = fileparts(elec_path); + px = [px ':' nodePath]; + else + elec_path = fullfile(leverpath,'node_modules','.bin','electron'); + end + elec_cmd = [elec_path ' ' fullfile(leverpath,'elever','main.js')]; else [status,~] = system(['which ' elec_cmd]); if ( status ~= 0 ) @@ -118,8 +128,8 @@ end if exist('strDB','var') && ~isempty(strDB) elec_cmd = [elec_cmd ' --leverFile=' strDB ' ']; end -cmd = [elec_cmd ' --port=' num2str(port) ' --title="figure ' num2str(fignum) '"' ' &']; -system(cmd); +cmd = [elec_cmd ' --port=' num2str(port) ' --title="figure ' num2str(fignum) '"' ' &'] +system(cmd,'PATH',px); end function launch_electron_windows(port,fignum,workdir, leverpath, strDB)