diff --git a/Viewer/Makefile b/Viewer/Makefile index 3246c5dc..ae2f3a46 100755 --- a/Viewer/Makefile +++ b/Viewer/Makefile @@ -283,7 +283,6 @@ CSS_DIR = css CFG_DIR = cfg DOMAIN_DIR = imagegrid FEATURES_DIR = features -WORKERS_DIR = workers IMAGES_DIR = images ASSET_DIR := data @@ -299,7 +298,6 @@ ROOT_JS_FILES := $(wildcard *.js) JS_FILES := $(ROOT_JS_FILES) \ $(wildcard $(DOMAIN_DIR)/*.js) \ $(wildcard $(FEATURES_DIR)/*.js) \ - $(wildcard $(WORKERS_DIR)/*.js) \ $(wildcard $(LIB_DIR)/*.js) \ $(wildcard $(LIB_DIR)/*/*.js) \ $(wildcard $(EXT_LIB_DIR)/*.js) @@ -656,7 +654,7 @@ $(BUILD_DIR)/$(APP_NAME)/: $(PROJECT_FILES) \ $(MD) "$@" cp -r $(PROJECT_FILES) $(ROOT_JS_FILES) $(HTML_FILES) \ $(CFG_DIR) $(LIB_DIR) $(EXT_LIB_DIR) $(FEATURES_DIR) \ - $(DOMAIN_DIR) $(WORKERS_DIR) $(CSS_DIR) $(IMAGES_DIR) \ + $(DOMAIN_DIR) $(CSS_DIR) $(IMAGES_DIR) \ $(ASSET_DIR) \ $(BUILD_INFO) \ $(LICENSE) \ diff --git a/Viewer/doc/NOTES b/Viewer/doc/NOTES index dbc2b219..18e9a27c 100755 --- a/Viewer/doc/NOTES +++ b/Viewer/doc/NOTES @@ -1,4 +1,25 @@ +Debugging startup errors +======================== + +If something goes wrong on startup -- the splash screen is shown but the +main window is not, DevTools should be automatically started in about 5 +seconds. + +If DevTools does not run then they can be started manually by: + $ IMAGEGRID_DEBUG=1 ig.js gui +or: + $ IMAGEGRID_DEBUG=1 make run + +Common reasons for failure on startup: + - path set in cfg/requirejs.js (baseUrl) is not correct on this + version on node/electron + - electron compatibility issue + - rarely: some feature fails to call .declareReady() and the + startup process stalls waiting for it, this can be manually + overridden by calling .ready() + + Modules and RequireJS ===================== diff --git a/Viewer/e.js b/Viewer/e.js index a966cfe7..8c963c15 100644 --- a/Viewer/e.js +++ b/Viewer/e.js @@ -136,9 +136,11 @@ function createWindow(){ function(){ WIN = null }) // devtools for different windows... + //process.env.IMAGEGRID_ROOT_DEBUG + // && WIN.openDevTools({mode: 'undocked'}) process.env.IMAGEGRID_DEBUG && WIN.openDevTools({mode: 'undocked'}) - //WIN.webContents.openDevTools({mode: 'undocked'}) + //&& WIN.webContents.openDevTools({mode: 'undocked'}) return WIN }