From bbc598323e5d056c562ff22487324eaaf2324efe Mon Sep 17 00:00:00 2001
From: Erik Ziegler <erik.sweed@gmail.com>
Date: Wed, 5 Jun 2019 22:44:14 +0200
Subject: [PATCH] fix(initWebWorkers): Fix duplicate slashes for web worker
 paths (#527)

---
 src/utils/initWebWorkers.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/utils/initWebWorkers.js b/src/utils/initWebWorkers.js
index 462d065da..a2b0bd8fc 100644
--- a/src/utils/initWebWorkers.js
+++ b/src/utils/initWebWorkers.js
@@ -5,19 +5,28 @@ import cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader';
  * @param {String} baseDirectory
  * @param {String} webWorkScriptsPath
  */
-export default function(baseDirectory, webWorkScriptsPath) {
-  const scriptsPath = `${window.location.protocol}//${
+export default function initWebWorkers(
+  baseDirectory = '/',
+  webWorkScriptsPath = ''
+) {
+  let scriptsPath = `${window.location.protocol}//${
     window.location.host
-  }${baseDirectory}/${webWorkScriptsPath}`;
+  }${baseDirectory}${webWorkScriptsPath}`;
+
+  // Ensure the last character is a slash
+  if (scriptsPath[scriptsPath.length - 1] !== '/') {
+    scriptsPath += '/';
+  }
+
   const config = {
     maxWebWorkers: Math.max(navigator.hardwareConcurrency - 1, 1),
     startWebWorkersOnDemand: true,
-    webWorkerPath: `${scriptsPath}/cornerstoneWADOImageLoaderWebWorker.min.js`,
+    webWorkerPath: `${scriptsPath}cornerstoneWADOImageLoaderWebWorker.min.js`,
     taskConfiguration: {
       decodeTask: {
         loadCodecsOnStartup: true,
         initializeCodecsOnStartup: false,
-        codecsPath: `${scriptsPath}/cornerstoneWADOImageLoaderCodecs.min.js`,
+        codecsPath: `${scriptsPath}cornerstoneWADOImageLoaderCodecs.min.js`,
         usePDFJS: false,
         strict: false,
       },