Fix OHIF global variable definition bug in OHIF Viewer, moved resizeViewportElements to viewerbase

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

@@ -23,6 +23,13 @@ Template.playClipButton.helpers({
     'isPlaying': function() {
         Session.get('UpdateCINE');
         var activeViewport = Session.get('activeViewport');
+
+        // TODO=Check best way to make sure this is always defined
+        // Right now it is initialized in enableHotkeys AND in 
+        // imageViewer onCreated, but this appears to break some things
+        if (!OHIF.viewer.isPlaying) {
+            return;
+        }
         return !!OHIF.viewer.isPlaying[activeViewport];
     }
 });

Packages/viewerbase/lib/resizeViewportElements.js

@@ -0,0 +1,35 @@
+var resizeTimer;
+
+handleResize = function() {
+    // Avoid doing DOM manipulation during the resize handler
+    // because it is fired very often.
+    // Resizing is therefore performed 100 ms after the resize event stops.
+    clearTimeout(resizeTimer);
+    resizeTimer = setTimeout(function() {
+        resizeViewportElements();
+    }, 100);
+};
+
+// Resize viewport elements
+resizeViewportElements = function() {
+    viewportResizeTimer = setTimeout(function() {
+        var elements = $('.imageViewerViewport').not('.empty');
+        elements.each(function(index, element) {
+            cornerstone.resize(element, true);
+
+            // TODO= Refactor this into separate scrollbar resize function
+            var currentOverlay = $(element).siblings('.imageViewerViewportOverlay');
+            var imageControls = currentOverlay.find('.imageControls');
+            currentOverlay.find('.imageControls').height($(element).height());
+
+            // Set it's width to its parent's height
+            // (because webkit is stupid and can't style vertical sliders)
+            var scrollbar = currentOverlay.find('#scrollbar');
+            scrollbar.height(scrollbar.parent().height() - 20);
+
+            var currentImageSlider = currentOverlay.find('#imageSlider');
+            var overlayHeight = currentImageSlider.parent().height();
+            currentImageSlider.width(overlayHeight);
+        });
+    }, 1);
+};

Packages/viewerbase/lib/toolManager.js

@@ -72,7 +72,10 @@ toolManager = {
             mouse: cornerstoneTools.arrowAnnotate,
             touch: cornerstoneTools.arrowAnnotateTouch
         });
-        activeTool = OHIF.viewer.defaultTool;
+
+        if (OHIF.viewer.defaultTool) {
+            activeTool = OHIF.viewer.defaultTool;
+        }
 
         configureTools();
         initialized = true;

Packages/viewerbase/package.js

@@ -121,10 +121,12 @@ Package.onUse(function (api) {
     api.addFiles('lib/enableHotkeys.js', 'client');
     api.addFiles('lib/viewportFunctions.js', 'client');
     api.addFiles('lib/WLPresets.js', 'client');
-
+    api.addFiles('lib/resizeViewportElements.js', 'client');
     api.addFiles('lib/encodeQueryData.js', 'server');
 
     //api.export('accountsConfig', 'client');
+    api.export('resizeViewportElements','client');
+    api.export('handleResize','client');
     api.export('enableHotkeys', 'client');
     api.export('enablePrefetchOnElement', 'client');
     api.export('displayReferenceLines', 'client');