Most JS files, all helpers and simple reconciliations

Packages/ohif-viewerbase/client/lib/setActiveViewport.js

@@ -1,14 +1,32 @@
+import { Session } from 'meteor/session';
+import { $ } from 'meteor/jquery';
 import { OHIF } from 'meteor/ohif:core';
+import { enablePrefetchOnElement } from './enablePrefetchOnElement';
+import { displayReferenceLines } from './displayReferenceLines';
 
-setActiveViewport = element => {
+/**
+ * Sets a viewport element active
+ * @param  {node} element DOM element to be activated
+ */
+export function setActiveViewport(element) {
     if (!element) {
+        OHIF.log.info('setActiveViewport element does not exist');
         return;
     }
 
-    const viewportIndex = $('.imageViewerViewport').index(element);
+    const viewerports = $('.imageViewerViewport');
+    const viewportIndex = viewerports.index(element);
     const jQueryElement = $(element);
 
-    // When an ActivateViewport event is fired, update the Meteor Session
+    OHIF.log.info(`setActiveViewport setting viewport index: ${viewportIndex}`);
+
+    // If viewport is not active
+    if(!jQueryElement.parents('.viewportContainer').hasClass('active')) {
+        // Trigger an event for compatibility with other systems
+        jQueryElement.trigger('OHIFBeforeActivateViewport');
+    }
+
+    // When an OHIFActivateViewport event is fired, update the Meteor Session
     // with the viewport index that it was fired from.
     Session.set('activeViewport', viewportIndex);
 
@@ -28,11 +46,19 @@ setActiveViewport = element => {
         const domElement = jQueryElement.get(0);
         enablePrefetchOnElement(domElement);
         displayReferenceLines(domElement);
-        OHIF.viewer.stackImagePositionOffsetSynchronizer.update();
+        // @TODO Add this to OHIFAfterActivateViewport handler...
+        if (OHIF.viewer.stackImagePositionOffsetSynchronizer) {
+            OHIF.viewer.stackImagePositionOffsetSynchronizer.update();
+        }
     }
 
     // Set the div to focused, so keypress events are handled
     //$(element).focus();
     //.focus() event breaks in FF&IE
     jQueryElement.triggerHandler('focus');
-};
+
+    // Trigger OHIFAfterActivateViewport event on activated instance
+    // for compatibility with other systems
+    jQueryElement.trigger('OHIFAfterActivateViewport');
+
+}