Allow to set the help resources path. Fixes #457.

ivmartel · Mar 1, 2018 · 2dbe086 · 2dbe086
1 parent 2df9283
commit 2dbe086
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/src/app/application.js b/src/app/application.js
@@ -76,6 +76,9 @@ dwv.App = function ()
     // listeners
     var listeners = {};
 
+    // help resources path
+    var helpResourcesPath = "./";
+
     /**
      * Get the image.
      * @return {Image} The associated image.
@@ -165,6 +168,14 @@ dwv.App = function ()
      */
     this.getStyle = function () { return style; };
 
+    /**
+     * Get the help resources path.
+     * @return {String} The path.
+     */
+    this.getHelpResourcesPath = function () {
+        return helpResourcesPath;
+    };
+
     /**
      * Add a command to the undo stack.
      * @param {Object} The command to add.
@@ -297,6 +308,10 @@ dwv.App = function ()
                 if ( config.isMobile !== "undefined" ) {
                     isMobile = config.isMobile;
                 }
+                // help resources path
+                if ( typeof config.helpResourcesPath !== "undefined" ) {
+                    helpResourcesPath = config.helpResourcesPath;
+                }
                 dwv.gui.appendHelpHtml( toolboxController.getToolList(), isMobile, this );
             }
         }

diff --git a/src/gui/help.js b/src/gui/help.js
@@ -29,10 +29,6 @@ dwv.gui.base.appendHelpHtml = function(toolList, mobile, app)
 
     var toolHelpDiv = document.createElement("div");
 
-    // current location
-    var loc = window.location.pathname;
-    var dir = loc.substring(0, loc.lastIndexOf('/'));
-
     var tool = null;
     var tkeys = Object.keys(toolList);
     for ( var t=0; t < tkeys.length; ++t )
@@ -55,7 +51,7 @@ dwv.gui.base.appendHelpHtml = function(toolList, mobile, app)
                 var action = tool.getHelp()[actionType][keys[i]];
 
                 var img = document.createElement("img");
-                img.src = dir + "/../../resources/help/"+keys[i]+".png";
+                img.src = app.getHelpResourcesPath() + "/" + keys[i] + ".png";
                 img.style.float = "left";
                 img.style.margin = "0px 15px 15px 0px";
 

diff --git a/viewers/mobile/applauncher.js b/viewers/mobile/applauncher.js
@@ -50,7 +50,8 @@ function startApp() {
         "tools": ["Scroll", "WindowLevel", "ZoomAndPan", "Draw", "Livewire", "Filter", "Floodfill"],
         "filters": ["Threshold", "Sharpen", "Sobel"],
         "shapes": ["Arrow", "Ruler", "Protractor", "Rectangle", "Roi", "Ellipse", "FreeHand"],
-        "isMobile": true
+        "isMobile": true,
+        "helpResourcesPath": "../../resources/help"
         //"defaultCharacterSet": "chinese"
     };
     if ( dwv.browser.hasInputDirectory() ) {

diff --git a/viewers/static/applauncher.js b/viewers/static/applauncher.js
@@ -18,7 +18,8 @@ function startApp() {
         "tools": ["Scroll", "WindowLevel", "ZoomAndPan", "Draw", "Livewire", "Filter", "Floodfill"],
         "filters": ["Threshold", "Sharpen", "Sobel"],
         "shapes": ["Arrow", "Ruler", "Protractor", "Rectangle", "Roi", "Ellipse", "FreeHand"],
-        "isMobile": false
+        "isMobile": false,
+        "helpResourcesPath": "../../resources/help"
     };
     if ( dwv.browser.hasInputDirectory() ) {
         options.loaders.splice(1, 0, "Folder");