TrizTech/ohif-viewer
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(initWebWorkers): Fix duplicate slashes for web worker paths (#527)

Browse Source
This commit is contained in:
Erik Ziegler 2019-06-05 22:44:14 +02:00 committed by GitHub
parent d20492ac62
commit bbc598323e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/utils/initWebWorkers.js
View File

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