#112 DICOM Viewer Plugin Compatibility with NC 29 (#115)

ayselafsar · May 25, 2024 · ec95573 · ec95573
1 parent 9ca0079
commit ec95573
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/main.js b/src/main.js
@@ -1,10 +1,11 @@
+import { generateUrl } from '@nextcloud/router';
 import DICOMView from './views/DICOMView.vue';
 import generateFullUrl from './utils/generateFullUrl.js';
 import registerFileActions from './utils/registerFileActions.js';
 import './sidebar.js';
 
 // Add MimeType Icon
-OC.MimeType._mimeTypeIcons['application/dicom'] = `${generateFullUrl(OC.filePath('dicomviewer', 'img', 'app.svg'))}`;
+OC.MimeType._mimeTypeIcons['application/dicom'] = `${generateFullUrl(generateUrl('/apps/dicomviewer/img/app.svg'))}`;
 
 OCA.Viewer.registerHandler({
     id: 'dicom',

diff --git a/src/utils/configureCodecs.js b/src/utils/configureCodecs.js
@@ -1,3 +1,4 @@
+import { generateUrl } from '@nextcloud/router';
 import { cornerstone, cornerstoneWADOImageLoader } from './cornerstonejs.js';
 import generateFullUrl from './generateFullUrl.js';
 
@@ -9,12 +10,12 @@ export default function() {
     const config = {
         maxWebWorkers,
         startWebWorkersOnDemand: true,
-        webWorkerPath: `${generateFullUrl(OC.filePath('dicomviewer', 'js', 'public/cornerstoneWADOImageLoaderWebWorker.js'))}`,
+        webWorkerPath: `${generateFullUrl(generateUrl('/apps/dicomviewer/js/public/cornerstoneWADOImageLoaderWebWorker.js'))}`,
         taskConfiguration: {
             decodeTask: {
                 loadCodecsOnStartup: true,
                 initializeCodecsOnStartup: false,
-                codecsPath: `${generateFullUrl(OC.filePath('dicomviewer', 'js', 'public/cornerstoneWADOImageLoaderCodecs.js'))}`,
+                codecsPath: `${generateFullUrl(generateUrl('/apps/dicomviewer/js/public/cornerstoneWADOImageLoaderCodecs.js'))}`,
                 usePDFJS: false
             },
         },

diff --git a/src/utils/generateFullUrl.js b/src/utils/generateFullUrl.js
@@ -1,4 +1,4 @@
-const BASE_URL = `${OC.getProtocol()}://${OC.getHost()}`;
+const BASE_URL = `${window.location.protocol}//${window.location.host}`;
 
 export default function(url) {
     return `${BASE_URL}${url}`;