Fix Viewer opening bugs in OHIF Viewer (OHIF-49)

Packages/viewerbase/client/components/viewer/layoutChooser/layoutChooser.js

@@ -45,9 +45,9 @@ Template.layoutChooser.events({
             columns: columnIndex + 1
         };
 
-        layoutManager.layoutTemplateName = 'gridLayout';
-        layoutManager.layoutProps = layoutProps;
-        layoutManager.updateViewports();
+        window.layoutManager.layoutTemplateName = 'gridLayout';
+        window.layoutManager.layoutProps = layoutProps;
+        window.layoutManager.updateViewports();
 
         const $dropdown = $('.layoutChooser');
         toggleDialog($dropdown);

Packages/viewerbase/client/components/viewer/loadingIndicator/loadingIndicator.html

@@ -1,7 +1,7 @@
 <template name="loadingIndicator">
     <div class="imageViewerLoadingIndicator loadingIndicator">
         <div class="indicatorContents">
-            <p>Loading... {{percentComplete}}</p>
+            <p>Loading... <i class="fa fa-spin fa-circle-o-notch fa-fw"></i> {{percentComplete}}</p>
         </div>
     </div>
     <div class="imageViewerErrorLoadingIndicator loadingIndicator">

Packages/viewerbase/client/components/viewer/loadingIndicator/loadingIndicator.styl

@@ -30,4 +30,7 @@
     position: absolute
     top: 40%
     width: 100%
+    color: $textSecondaryColor
+    font-size: 30px
+    font-weight: 200
     text-align: center

Packages/viewerbase/client/components/viewer/viewerMain/viewerMain.js

@@ -10,7 +10,7 @@ Template.viewerMain.onRendered(() => {
     const instance = Template.instance();
 
     const studies = instance.data.studies;
-    const parentElement = instance.$("#layoutManagerTarget").get(0);
+    const parentElement = instance.$('#layoutManagerTarget').get(0);
     window.layoutManager = new LayoutManager(parentElement, studies);
 
     ProtocolEngine = new HP.ProtocolEngine(window.layoutManager, studies);
@@ -26,4 +26,7 @@ Template.viewerMain.onDestroyed(() => {
 
     // Destroy the synchronizer used to update reference lines
     OHIF.viewer.updateImageSynchronizer.destroy();
-});
+
+    delete window.layoutManager;
+    delete ProtocolEngine;
+});