flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-29 10:20:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug in requirejs defaults and moved to electron v7...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2020-08-30 19:55:01 +03:00
parent bdef19ccf8
commit f3255921fd
5 changed files with 529 additions and 485 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Viewer/cfg/requirejs.js
View File

@ -4,6 +4,9 @@
* *
**********************************************************************/ **********************************************************************/
var requirejs_cfg = { var requirejs_cfg = {
// NOTE: on electron v7+ the default seems to be '../', bug?
baseUrl: './',
// XXX this does not work on direct filesystem access... // XXX this does not work on direct filesystem access...
//urlArgs: 'bust='+Date.now(), //urlArgs: 'bust='+Date.now(),

1
Viewer/e.js
View File

@ -101,6 +101,7 @@ function createWindow(){
win = new BrowserWindow({ win = new BrowserWindow({
webPreferences: { webPreferences: {
nodeIntegration: true, nodeIntegration: true,
contextIsolation: false,
}, },
// let the window to get ready before we show it to the user... // let the window to get ready before we show it to the user...

1
Viewer/electron.html
View File

@ -97,7 +97,6 @@ if(window.require){
<script> <script>
require('./cfg/requirejs') require('./cfg/requirejs')
// XXX BUG this is broken on electron 7+...
requirejs('ui') requirejs('ui')
</script> </script>

1007
Viewer/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
Viewer/package.json
View File

@ -20,7 +20,7 @@
"dependencies": { "dependencies": {
"app-module-path": "^1.0.6", "app-module-path": "^1.0.6",
"async-json": "0.0.2", "async-json": "0.0.2",
"electron": "^6.0.0", "electron": "^7.0.0",
"exiftool": "^0.0.3", "exiftool": "^0.0.3",
"fs-extra": "^7.0.1", "fs-extra": "^7.0.1",
"fs-walk": "^0.0.1", "fs-walk": "^0.0.1",