OHIF-149 The viewer shall allow the root URL to be changed - WIP

- Use absoluteUrl for hard-coded paths in html and js
This commit is contained in:
Evren Ozkan committed 2017-01-10 13:09:43 -05:00
1 parent a91894c42d
commit 76ebe11c8e
20 files changed
+42 -31

No files matched your search

@@ -28,7 +28,7 @@
</a>
<div class="logo p-x-3 p-y-3">
<svg class="logoImage">
<use xlink:href="/packages/ohif_viewerbase/assets/icons.svg#icon-ohif-logo"></use>
<use xlink:href={{absoluteUrl "packages/ohif_viewerbase/assets/icons.svg#icon-ohif-logo"}}></use>
</svg>
<a class="logoText"
target="_blank"
@@ -7,7 +7,7 @@
<div class="svgContainer">
{{#if this.svgLink}}
<svg>
<use xlink:href={{this.svgLink}}></use>
<use xlink:href={{absoluteUrl this.svgLink}}></use>
</svg>
{{else}}
<i class={{iconClasses}}></i>
@@ -9,7 +9,7 @@
{{#let svg=svgLink icon=iconClasses}}
{{#if svg}}
<svg>
<use xlink:href={{svg}}></use>
<use xlink:href={{absoluteUrl svg}}></use>
</svg>
{{else}}
<i class={{icon}}></i>
@@ -1,3 +1,5 @@
import { Meteor } from "meteor/meteor";
/**
* Obtain an imageId for Cornerstone from an image instance
*
@@ -14,7 +16,7 @@ getImageId = function(instance, frame) {
}
if (instance.wadouri) {
var imageId = 'dicomweb:' + instance.wadouri; // WADO-URI;
var imageId = 'dicomweb:' + Meteor.absoluteUrl(instance.wadouri); // WADO-URI;
if (frame !== undefined) {
imageId += '&frame=' + frame;
}
@@ -1,3 +1,4 @@
import { Meteor } from 'meteor/meteor';
import { OHIF } from 'meteor/ohif:core';
/**
@@ -25,7 +26,7 @@ getWADORSImageId = function(instance) {
}
var image = {
uri: instance.wadorsuri,
uri: Meteor.absoluteUrl(instance.wadorsuri),
//imageId : '',
//minPixelValue : 0,
//maxPixelValue : 255,