Do a better job of choosing a base url for worker import scripts.

aces · Nov 25, 2016 · 33af6b4 · 33af6b4
1 parent 76afedd
commit 33af6b4
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/src/brainbrowser/lib/utils.js b/src/brainbrowser/lib/utils.js
@@ -126,6 +126,25 @@
       return window.URL.createObjectURL(new Blob([data], {type : mime_type || "text/plain"}));
     },
 
+    /**
+    * @doc function
+    * @name BrainBrowser.utils:getWorkerImportURL
+    *
+    * @description
+    * Assemble an absolute path for possible script imports within
+    * a worker.
+    */
+    getWorkerImportURL: function() {
+      var worker_dir = BrainBrowser.config.get("worker_dir");
+      var import_url = document.location.origin + '/' + worker_dir;
+      var doc_href = document.location.href;
+      var slash_index = doc_href.lastIndexOf('/');
+      if (slash_index >= 0) {
+        import_url = doc_href.substring(0, slash_index + 1) + worker_dir;
+      }
+      return import_url;
+    },
+
     /**
     * @doc function
     * @name BrainBrowser.utils:min

diff --git a/src/brainbrowser/surface-viewer/lib/parse-intensity-data.js b/src/brainbrowser/surface-viewer/lib/parse-intensity-data.js
@@ -64,6 +64,6 @@ BrainBrowser.SurfaceViewer.parseIntensityData = function(data, type, callback) {
     worker.terminate();
   });
 
-  var url = document.location.protocol + '//' + document.location.host;
+  var url = BrainBrowser.utils.getWorkerImportURL();
   worker.postMessage({ cmd: "parse", data: data, url: url });
 };
diff --git a/src/brainbrowser/surface-viewer/modules/loading.js b/src/brainbrowser/surface-viewer/modules/loading.js
@@ -522,10 +522,11 @@ BrainBrowser.SurfaceViewer.modules.loading = function(viewer) {
       parse_worker.terminate();
     });
 
+    var import_url = BrainBrowser.utils.getWorkerImportURL();
     parse_worker.postMessage({
       data: data,
       options: options,
-      url: document.location.protocol + '//' + document.location.host
+      url: import_url
     });
 
   }

diff --git a/src/brainbrowser/workers/gifti.worker.js b/src/brainbrowser/workers/gifti.worker.js
@@ -53,7 +53,7 @@
      * message. This gets around issues with loading a script from
      * within a worker blob.
      */
-    importScripts(input.url + '/js/brainbrowser/workers/gifti-reader.js');
+    importScripts(input.url + 'gifti-reader.js');
 
     var result = parse(input.data) || {
       error: true,