From 82876ddbe7b298d6e6a4bd9e3a2503df7993c733 Mon Sep 17 00:00:00 2001 From: Evren Ozkan Date: Wed, 1 Mar 2017 16:43:11 -0500 Subject: [PATCH] =?UTF-8?q?OHIF-157=20Use=20OHIF.utils.absoluteUrl=20which?= =?UTF-8?q?=20removes=20the=20leading=20=E2=80=9C/=E2=80=9D=20from=20path?= =?UTF-8?q?=20before=20calling=20Meteor.absoluteUrl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LesionTracker/client/config.js | 5 +++-- LesionTracker/server/email.js | 4 +++- OHIFViewer/client/config.js | 5 +++-- Packages/ohif-core/client/helpers/blaze.js | 4 ++-- Packages/ohif-core/client/lib/utils.js | 6 ++++++ .../ohif-user-management/client/active-entry/activeEntry.js | 3 ++- Packages/ohif-viewerbase/client/lib/getImageId.js | 4 ++-- Packages/ohif-viewerbase/client/lib/getWADORSImageId.js | 5 ++--- 8 files changed, 23 insertions(+), 13 deletions(-) diff --git a/LesionTracker/client/config.js b/LesionTracker/client/config.js index ce8c5a6fd..dba72a935 100644 --- a/LesionTracker/client/config.js +++ b/LesionTracker/client/config.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { OHIF } from 'meteor/ohif:core'; import { cornerstoneWADOImageLoader } from 'meteor/ohif:cornerstone'; Meteor.startup(function() { @@ -6,12 +7,12 @@ Meteor.startup(function() { const config = { maxWebWorkers: maxWebWorkers, startWebWorkersOnDemand: true, - webWorkerPath : Meteor.absoluteUrl('packages/ohif_cornerstone/public/js/cornerstoneWADOImageLoaderWebWorker.es5.js'), + webWorkerPath : OHIF.utils.absoluteUrl('packages/ohif_cornerstone/public/js/cornerstoneWADOImageLoaderWebWorker.es5.js'), taskConfiguration: { 'decodeTask' : { loadCodecsOnStartup : true, initializeCodecsOnStartup: false, - codecsPath: Meteor.absoluteUrl('packages/ohif_cornerstone/public/js/cornerstoneWADOImageLoaderCodecs.es5.js'), + codecsPath: OHIF.utils.absoluteUrl('packages/ohif_cornerstone/public/js/cornerstoneWADOImageLoaderCodecs.es5.js'), usePDFJS: false } } diff --git a/LesionTracker/server/email.js b/LesionTracker/server/email.js index 535ce5549..cf4a20848 100644 --- a/LesionTracker/server/email.js +++ b/LesionTracker/server/email.js @@ -1,3 +1,5 @@ +import { OHIF } from 'meteor/ohif:core'; + Meteor.startup(function () { // Mail server settings @@ -33,7 +35,7 @@ Meteor.startup(function () { }; Accounts.urls.resetPassword = function(token) { - return Meteor.absoluteUrl('resetPassword/' + token); + return OHIF.utils.absoluteUrl('resetPassword/' + token); }; Accounts.emailTemplates.resetPassword.text = function(user, url) { diff --git a/OHIFViewer/client/config.js b/OHIFViewer/client/config.js index ce8c5a6fd..dba72a935 100644 --- a/OHIFViewer/client/config.js +++ b/OHIFViewer/client/config.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { OHIF } from 'meteor/ohif:core'; import { cornerstoneWADOImageLoader } from 'meteor/ohif:cornerstone'; Meteor.startup(function() { @@ -6,12 +7,12 @@ Meteor.startup(function() { const config = { maxWebWorkers: maxWebWorkers, startWebWorkersOnDemand: true, - webWorkerPath : Meteor.absoluteUrl('packages/ohif_cornerstone/public/js/cornerstoneWADOImageLoaderWebWorker.es5.js'), + webWorkerPath : OHIF.utils.absoluteUrl('packages/ohif_cornerstone/public/js/cornerstoneWADOImageLoaderWebWorker.es5.js'), taskConfiguration: { 'decodeTask' : { loadCodecsOnStartup : true, initializeCodecsOnStartup: false, - codecsPath: Meteor.absoluteUrl('packages/ohif_cornerstone/public/js/cornerstoneWADOImageLoaderCodecs.es5.js'), + codecsPath: OHIF.utils.absoluteUrl('packages/ohif_cornerstone/public/js/cornerstoneWADOImageLoaderCodecs.es5.js'), usePDFJS: false } } diff --git a/Packages/ohif-core/client/helpers/blaze.js b/Packages/ohif-core/client/helpers/blaze.js index 816fe19be..fd71b5943 100644 --- a/Packages/ohif-core/client/helpers/blaze.js +++ b/Packages/ohif-core/client/helpers/blaze.js @@ -1,7 +1,7 @@ -import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; import { Session } from 'meteor/session'; import { ReactiveVar } from 'meteor/reactive-var'; +import { OHIF } from 'meteor/ohif:core'; /** * Global Blaze UI helpers to work with Blaze @@ -9,7 +9,7 @@ import { ReactiveVar } from 'meteor/reactive-var'; // Return the absolute url Template.registerHelper('absoluteUrl', path => { - return Meteor.absoluteUrl(path); + return OHIF.utils.absoluteUrl(path); }); // Return the current template instance diff --git a/Packages/ohif-core/client/lib/utils.js b/Packages/ohif-core/client/lib/utils.js index 7bd90c660..09ba5aca8 100644 --- a/Packages/ohif-core/client/lib/utils.js +++ b/Packages/ohif-core/client/lib/utils.js @@ -1,5 +1,11 @@ import { OHIF } from 'meteor/ohif:core'; +// Return an absolute URL with the given path by supporting the leading "/" +OHIF.utils.absoluteUrl = function(path) { + path = path.replace(/^\//, ''); + return Meteor.absoluteUrl(path); +}; + // Return the array sorting function for its object's properties OHIF.utils.sortBy = function() { var fields = [].slice.call(arguments), diff --git a/Packages/ohif-user-management/client/active-entry/activeEntry.js b/Packages/ohif-user-management/client/active-entry/activeEntry.js index 0fdc1568e..38408395c 100644 --- a/Packages/ohif-user-management/client/active-entry/activeEntry.js +++ b/Packages/ohif-user-management/client/active-entry/activeEntry.js @@ -1,10 +1,11 @@ import { Meteor } from 'meteor/meteor'; +import { OHIF } from 'meteor/ohif:core'; Meteor.startup(function() { if (Meteor.isClient){ ActiveEntry.configure({ logo: { - url: Meteor.absoluteUrl('/images/logo.png'), + url: OHIF.utils.absoluteUrl('/images/logo.png'), displayed: true }, signIn: { diff --git a/Packages/ohif-viewerbase/client/lib/getImageId.js b/Packages/ohif-viewerbase/client/lib/getImageId.js index dbc3fd73a..8bc301afe 100644 --- a/Packages/ohif-viewerbase/client/lib/getImageId.js +++ b/Packages/ohif-viewerbase/client/lib/getImageId.js @@ -1,4 +1,4 @@ -import { Meteor } from "meteor/meteor"; +import { OHIF } from 'meteor/ohif:core'; import { getWADORSImageId } from './getWADORSImageId'; /** @@ -18,7 +18,7 @@ export function getImageId(instance, frame) { } if (instance.wadouri) { - var imageId = 'dicomweb:' + Meteor.absoluteUrl(instance.wadouri); + var imageId = 'dicomweb:' + OHIF.utils.absoluteUrl(instance.wadouri); if (frame !== undefined) { imageId += '&frame=' + frame; } diff --git a/Packages/ohif-viewerbase/client/lib/getWADORSImageId.js b/Packages/ohif-viewerbase/client/lib/getWADORSImageId.js index bd79d101b..979864c47 100644 --- a/Packages/ohif-viewerbase/client/lib/getWADORSImageId.js +++ b/Packages/ohif-viewerbase/client/lib/getWADORSImageId.js @@ -1,10 +1,9 @@ -import { Meteor } from 'meteor/meteor'; import { OHIF } from 'meteor/ohif:core'; /** * Obtain an imageId for Cornerstone based on the WADO-RS scheme * - * @param {object} instance metadata object (InstanceMetadata) + * @param {object} instanceMetada metadata object (InstanceMetadata) * @returns {string} The imageId to be used by Cornerstone */ @@ -28,7 +27,7 @@ export function getWADORSImageId(instanceMetada) { } const image = { - uri: Meteor.absoluteUrl(instance.wadorsuri), + uri: OHIF.utils.absoluteUrl(instance.wadorsuri), //imageId : '', //minPixelValue : 0, //maxPixelValue : 255,