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

more fixes...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2020-08-31 00:02:33 +03:00
parent cd0ff92fa8
commit 2a95e75a55
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Viewer/Makefile
View File

@ -266,6 +266,7 @@ DOMAIN_DIR = imagegrid
FEATURES_DIR = features FEATURES_DIR = features
WORKERS_DIR = workers WORKERS_DIR = workers
IMAGES_DIR = images IMAGES_DIR = images
ASSET_DIR := data
LICENSE = LICENSE LICENSE = LICENSE
BUILD_INFO = $(BUILD_DIR)/INFO BUILD_INFO = $(BUILD_DIR)/INFO
@ -611,6 +612,7 @@ $(BUILD_DIR)/$(APP_NAME)/: $(PROJECT_FILES) \
cp -r $(PROJECT_FILES) $(ROOT_JS_FILES) $(HTML_FILES) \ cp -r $(PROJECT_FILES) $(ROOT_JS_FILES) $(HTML_FILES) \
$(CFG_DIR) $(LIB_DIR) $(EXT_LIB_DIR) $(FEATURES_DIR) \ $(CFG_DIR) $(LIB_DIR) $(EXT_LIB_DIR) $(FEATURES_DIR) \
$(DOMAIN_DIR) $(WORKERS_DIR) $(CSS_DIR) $(IMAGES_DIR) \ $(DOMAIN_DIR) $(WORKERS_DIR) $(CSS_DIR) $(IMAGES_DIR) \
$(ASSET_DIR) \
$(BUILD_INFO) \ $(BUILD_INFO) \
$(LICENSE) \ $(LICENSE) \
"$(BUILD_DIR)/$(APP_NAME)" "$(BUILD_DIR)/$(APP_NAME)"

10
Viewer/cfg/requirejs.js
View File

@ -3,9 +3,17 @@
* *
* *
**********************************************************************/ **********************************************************************/
var requirejs_cfg = { var requirejs_cfg = {
// NOTE: on electron v7+ the default seems to be '../', bug? // NOTE: on electron v7+ the default seems to be '../', bug?
baseUrl: './', //baseUrl: './',
baseUrl: typeof(document) != 'undefined' ?
document.baseURI
.replace(/^[a-zA-Z]+:\/\/\/?/, '')
.split(/[#&]/)[0].split(/[\\\/]/g).slice(0, -1).join('/')
: typeof(process) != 'undefined' ?
process.cwd().replace(/\\/g, '/')+'/'
: './',
// 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

@ -102,6 +102,7 @@ function createWindow(){
webPreferences: { webPreferences: {
nodeIntegration: true, nodeIntegration: true,
contextIsolation: false, contextIsolation: false,
enableRemoteModule: true,
}, },
// 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...