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

OHIF-157 Use OHIF.utils.absoluteUrl which removes the leading “/” from path before calling Meteor.absoluteUrl

Browse Source
This commit is contained in:
Evren Ozkan 2017-03-01 16:43:11 -05:00
parent 583147c542
commit 82876ddbe7
8 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
LesionTracker/client/config.js
View File

@ -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
}
}

4
LesionTracker/server/email.js
View File

@ -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) {

5
OHIFViewer/client/config.js
View File

@ -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
}
}

4
Packages/ohif-core/client/helpers/blaze.js
View File

@ -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

6
Packages/ohif-core/client/lib/utils.js
View File

@ -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),

3
Packages/ohif-user-management/client/active-entry/activeEntry.js
View File

@ -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: {

4
Packages/ohif-viewerbase/client/lib/getImageId.js
View File

@ -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;
}

5
Packages/ohif-viewerbase/client/lib/getWADORSImageId.js
View File

@ -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,