From eb589f4eb9b331aa1aa6b65532f7aa7cf78f7096 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Wed, 26 Jan 2022 22:45:41 +0300 Subject: [PATCH] tweaks... Signed-off-by: Alex A. Naanou --- Viewer/features/app.js | 15 +++------------ Viewer/package-lock.json | 4 ++-- Viewer/package.json | 4 ++-- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/Viewer/features/app.js b/Viewer/features/app.js index d409a3df..a17a0fcd 100755 --- a/Viewer/features/app.js +++ b/Viewer/features/app.js @@ -214,8 +214,7 @@ var NWHostActions = actions.Actions({ // XXX get the devtools stage... return false } nw.Window.get().showDevTools && - nw.Window.get().showDevTools() - }], + nw.Window.get().showDevTools() }], showInFolder: ['File|Image/Show in $folder', function(image){ image = this.images[this.data.getImage(image)] @@ -224,8 +223,7 @@ var NWHostActions = actions.Actions({ var filename = image.path var path = pathlib.normalize(base + '/' + filename) - nw.Shell.showItemInFolder(path) - }], + nw.Shell.showItemInFolder(path) }], toggleSplashScreen: ['Interface/', {mode: 'advancedBrowseModeAction'}, @@ -270,18 +268,11 @@ var ElectronHostActions = actions.Actions({ value && window.moveTo(...value) }, - // XXX revise... - // XXX need to handle mazimize correctly -- see e.js... + // XXX need to handle maximize correctly -- see e.js... // XXX do we need .hide(..) here??? show: ['- Window/', function(){ electron.ipcRenderer.send('show') }], - // if(electron.remote.getGlobal('readyToShow')){ - // electron.remote.getCurrentWindow().show() - // } else { - // var win = electron.remote.getCurrentWindow() - // win.once('ready-to-show', - // function(){ win.show() }) } }], minimize: ['Window/Minimize', function(){ electron.ipcRenderer.send('minimize') }], diff --git a/Viewer/package-lock.json b/Viewer/package-lock.json index 144e6733..e23d6b54 100755 --- a/Viewer/package-lock.json +++ b/Viewer/package-lock.json @@ -28,8 +28,8 @@ "ig-types": "^6.0.9", "json5": "^2.2.0", "object-run": "^1.0.1", - "requirejs": "^2.3.6", - "requirejs-plugins": "^1.0.2", + "requirejs": "*", + "requirejs-plugins": "*", "sharp": "^0.25.4", "v8-compile-cache": "^2.2.0", "wildglob": "^0.1.1" diff --git a/Viewer/package.json b/Viewer/package.json index 3dfe048e..7f3f57c9 100755 --- a/Viewer/package.json +++ b/Viewer/package.json @@ -38,8 +38,8 @@ "ig-types": "^6.0.9", "json5": "^2.2.0", "object-run": "^1.0.1", - "requirejs": "^2.3.6", - "requirejs-plugins": "^1.0.2", + "requirejs": "*", + "requirejs-plugins": "*", "sharp": "^0.25.4", "v8-compile-cache": "^2.2.0", "wildglob": "^0.1.1"