Use the web root public path where appropriate.

girder · Feb 20, 2020 · f43dedc · f43dedc
1 parent 3783398
commit f43dedc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/girder/girder_large_image/web_client/views/imageViewerWidget/geojs.js b/girder/girder_large_image/web_client/views/imageViewerWidget/geojs.js
@@ -16,6 +16,11 @@ var GeojsImageViewerWidget = ImageViewerWidget.extend({
         this._scale = settings.scale;
         this._setFrames = settings.setFrames;
 
+        let root = '/static/built';
+        try {
+            root = __webpack_public_path__ || root; // eslint-disable-line
+        } catch (err) { }
+        root = root.replace(/\/$/, '');
         $.when(
             ImageViewerWidget.prototype.initialize.call(this, settings).then(() => {
                 if (this.metadata.geospatial) {
@@ -36,7 +41,7 @@ var GeojsImageViewerWidget = ImageViewerWidget.extend({
                 return this;
             }),
             $.ajax({ // like $.getScript, but allow caching
-                url: '/static/built/plugins/large_image/extra/geojs.js',
+                url: root + '/plugins/large_image/extra/geojs.js',
                 dataType: 'script',
                 cache: true
             }))

diff --git a/girder/girder_large_image/web_client/views/imageViewerWidget/slideatlas.js b/girder/girder_large_image/web_client/views/imageViewerWidget/slideatlas.js
@@ -4,20 +4,25 @@ import ImageViewerWidget from './base';
 
 var SlideAtlasImageViewerWidget = ImageViewerWidget.extend({
     initialize: function (settings) {
+        let root = '/static/built';
+        try {
+            root = __webpack_public_path__ || root; // eslint-disable-line
+        } catch (err) { }
+        root = root.replace(/\/$/, '');
         if (!$('head #large_image-slideatlas-css').length) {
             $('head').prepend(
                 $('<link>', {
                     id: 'large_image-slideatlas-css',
                     rel: 'stylesheet',
-                    href: '/static/built/plugins/large_image/extra/slideatlas/sa.css'
+                    href: root + '/plugins/large_image/extra/slideatlas/sa.css'
                 })
             );
         }
 
         $.when(
             ImageViewerWidget.prototype.initialize.call(this, settings),
             $.ajax({ // like $.getScript, but allow caching
-                url: '/static/built/plugins/large_image/extra/slideatlas/sa-all.min.js',
+                url: root + '/plugins/large_image/extra/slideatlas/sa-all.min.js',
                 dataType: 'script',
                 cache: true
             }))
@@ -52,10 +57,15 @@ var SlideAtlasImageViewerWidget = ImageViewerWidget.extend({
         // TODO: if a viewer already exists, do we render again?
         // SlideAtlas bundles its own version of jQuery, which should attach itself to "window.$" when it's sourced
         // The "this.$el" still uses the Girder version of jQuery, which will not have "saViewer" registered on it.
+        let root = '/static/built';
+        try {
+            root = __webpack_public_path__ || root; // eslint-disable-line
+        } catch (err) { }
+        root = root.replace(/\/$/, '');
         window.$(this.el).saViewer({
             zoomWidget: true,
             drawWidget: true,
-            prefixUrl: '/static/built/plugins/large_image/extra/slideatlas/img/',
+            prefixUrl: root + '/plugins/large_image/extra/slideatlas/img/',
             tileSource: {
                 height: this.sizeY,
                 width: this.sizeX,