reorganize packages, start converting overall app to react (very broken at the moment)

2018-12-12 18:06:25 +01:00
1 parent 024fe1a448
commit 5f30f7bd35
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Session } from 'meteor/session';
 import { Tracker } from 'meteor/tracker';
-import { _ } from 'meteor/underscore';
+import _ from 'underscore';
 import { OHIF } from 'meteor/ohif:core';
 import { cornerstone } from 'meteor/ohif:cornerstone';
 import { viewportUtils } from './viewportUtils';
@@ -3,8 +3,8 @@ import { Blaze } from 'meteor/blaze';
 import { Session } from 'meteor/session';
 import { Tracker } from 'meteor/tracker';
 import { Template } from 'meteor/templating';
-import { _ } from 'meteor/underscore';
-import { $ } from 'meteor/jquery';
+import _ from 'underscore';
+import $ from 'jquery';

 import { OHIF } from 'meteor/ohif:core';

@@ -1,5 +1,5 @@
 import { Session } from 'meteor/session';
-import { $ } from 'meteor/jquery';
+import $ from 'jquery';
 import { OHIF } from 'meteor/ohif:core';
 import { getInstanceClassDefaultViewport } from '../instanceClassSpecificViewport';

@@ -1,5 +1,5 @@
 import { Session } from 'meteor/session';
-import { $ } from 'meteor/jquery';
+import $ from 'jquery';
 import { OHIF } from 'meteor/ohif:core';
 import { cornerstone, cornerstoneTools } from 'meteor/ohif:cornerstone';
 import { toolManager } from '../toolManager';
@@ -1,4 +1,4 @@
-import { $ } from 'meteor/jquery';
+import $ from 'jquery';
 import { Session } from 'meteor/session';
 import { OHIF } from 'meteor/ohif:core';
 import { cornerstone, cornerstoneWADOImageLoader } from 'meteor/ohif:cornerstone';
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Session } from 'meteor/session';
-import { $ } from 'meteor/jquery';
-import { _ } from 'meteor/underscore';
+import $ from 'jquery';
+import _ from 'underscore';
 import { OHIF } from 'meteor/ohif:core';
 import { OHIFError } from './OHIFError';
 import { StackManager } from '../StackManager.js';
@@ -1,6 +1,6 @@
 import { Blaze } from 'meteor/blaze';
 import { Template } from 'meteor/templating';
-import { $ } from 'meteor/jquery';
+import $ from 'jquery';

 import { setFocusToActiveViewport } from './setFocusToActiveViewport';

@@ -8,7 +8,7 @@ let doneCallbackFunction;

 /**
 * Removes the backdrop abd closes opened dialog
- * and focus to the active viewport. If a done callback is set, 
+ * and focus to the active viewport. If a done callback is set,
 * it's called before
 * @param  {Boolean} runCallback Indicate if callback function needs to be called. Default: true
 */
@@ -69,4 +69,4 @@ const dialogUtils = {
    closeHandler
 };

-export { dialogUtils };
+export { dialogUtils };
@@ -1,4 +1,4 @@
-import { $ } from 'meteor/jquery';
+import $ from 'jquery';

 export function getElementIfNotEmpty(viewportIndex) {
    // Meteor template helpers run more often than expected
@@ -1,5 +1,5 @@
 import { Blaze } from 'meteor/blaze';
-import { moment } from 'meteor/momentjs:moment';
+import moment from 'moment';

 /**
 * A global Blaze UI helper function to format DICOM Dates using the Moment library
@@ -1,5 +1,5 @@
 import { Blaze } from 'meteor/blaze';
-import { moment } from 'meteor/momentjs:moment';
+import moment from 'moment';

 /**
 * A global Blaze UI helper function to format JavaScript Dates using the Moment library
@@ -1,5 +1,5 @@
 import { Blaze } from 'meteor/blaze';
-import { moment } from 'meteor/momentjs:moment';
+import moment from 'moment';

 /**
 * A global Blaze UI helper to format a DICOM Time for display using the Moment library
@@ -10,7 +10,7 @@ const formatTM = (context, options) => {
        return;
    }

-    // DICOM Time is stored as HHmmss.SSS, where: 
+    // DICOM Time is stored as HHmmss.SSS, where:
    //      HH 24 hour time:
    //      m mm    0..59   Minutes
    //      s ss    0..59   Seconds
@@ -1,7 +1,7 @@
 import { Template } from 'meteor/templating';
 import { Session } from 'meteor/session';
-import { $ } from 'meteor/jquery';
-import { _ } from 'meteor/underscore';
+import $ from 'jquery';
+import _ from 'underscore';

 import { OHIF } from 'meteor/ohif:core';
 import 'meteor/ohif:viewerbase';
@@ -19,7 +19,7 @@ Template.registerHelper('isDisplaySetActive', (displaySetInstanceUid, viewportIn
    }

    // Check if the display set is current visible in any of the layout
-    // manager's displayed viewports. Note that we have to check the 
+    // manager's displayed viewports. Note that we have to check the
    // onscreen number of viewports here, since the layout manager will
    // keep the viewport data of old viewports, even after the layout is changed.
    //
@@ -1,6 +1,6 @@
 import { Blaze } from 'meteor/blaze';
 import { Session } from 'meteor/session';
-import { moment } from 'meteor/momentjs:moment';
+import moment from 'moment';

 /**
 * A global Blaze UI helper function to format JavaScript Dates using the Moment library
@@ -11,7 +11,7 @@ Blaze.registerHelper('jsDateFromNow', function(context, format, options) {
    }

    Session.get('timeAgoVariable');
-    
+
    var dateAsMoment = moment(new Date(context));
    return dateAsMoment.fromNow();
 });
@@ -1,5 +1,5 @@
 import { Blaze } from 'meteor/blaze';
-import { _ } from 'meteor/underscore';
+import _ from 'underscore';

 Blaze.registerHelper('objectEach', function(object) {
    // http://stackoverflow.com/questions/30234732/how-to-print-key-and-values-in-meteor-template
@@ -1,5 +1,5 @@
 import { Blaze } from 'meteor/blaze';
-import { _ } from 'meteor/underscore';
+import _ from 'underscore';

 Blaze.registerHelper('objectToPairs', function(object) {
    // http://stackoverflow.com/questions/30234732/how-to-print-key-and-values-in-meteor-template
@@ -1,5 +1,5 @@
 import { Template } from 'meteor/templating';
-import { _ } from 'meteor/underscore';
+import _ from 'underscore';

 /**
 * Global Blaze UI helper to sort array elements
@@ -1,5 +1,5 @@
 import { Template } from 'meteor/templating';
-import { _ } from 'meteor/underscore';
+import _ from 'underscore';

 /**
 * A global Blaze UI helper to get the thumbnails for the given study
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Session } from 'meteor/session';
-import { $ } from 'meteor/jquery';
-import { _ } from 'meteor/underscore';
+import $ from 'jquery';
+import _ from 'underscore';
 import { OHIF } from 'meteor/ohif:core';
 import { toolManager } from './toolManager';
 import { switchToImageRelative } from './switchToImageRelative';
@@ -1,5 +1,5 @@
 import { Session } from 'meteor/session';
-import { $ } from 'meteor/jquery';
+import $ from 'jquery';
 import { OHIF } from 'meteor/ohif:core';
 import { setActiveViewport } from './setActiveViewport';

@@ -1,4 +1,4 @@
-import { _ } from 'meteor/underscore';
+import _ from 'underscore';
 import { OHIF } from 'meteor/ohif:core';

 /**
@@ -1,5 +1,5 @@
 import { Session } from 'meteor/session';
-import { $ } from 'meteor/jquery';
+import $ from 'jquery';
 import { Random } from 'meteor/random';

 import { OHIF } from 'meteor/ohif:core';
@@ -1,5 +1,5 @@
 import { Session } from 'meteor/session';
-import { $ } from 'meteor/jquery';
+import $ from 'jquery';

 /**
 * Restores the browser focus to the currently specified active viewport
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { $ } from 'meteor/jquery';
+import $ from 'jquery';

 import { OHIF } from 'meteor/ohif:core';
 import { setInstanceClassDefaultViewportFunction } from './instanceClassSpecificViewport';
@@ -20,7 +20,7 @@ const setMammogramViewportAlignment = (series, enabledElement, imageId) => {
    const right = left + enabledElement.canvas.width;

    const metadataProvider = OHIF.viewer.metadataProvider;
-    
+
    let laterality = instance.laterality;
    let position;

@@ -1,4 +1,4 @@
-import { $ } from 'meteor/jquery';
+import $ from 'jquery';
 import { OHIF } from 'meteor/ohif:core';

 const cloneElement = (element, targetId) => {
@@ -1,4 +1,4 @@
-import { $ } from 'meteor/jquery';
+import $ from 'jquery';

 export function updateAllViewports() {
    var viewports = $('.imageViewerViewport').not('.empty');
@@ -1,4 +1,4 @@
-import { $ } from 'meteor/jquery';
+import $ from 'jquery';
 import { getFrameOfReferenceUID } from './getFrameOfReferenceUID';
 import { crosshairsSynchronizers } from './crosshairsSynchronizers';

@@ -1,4 +1,4 @@
-import { _ } from 'meteor/underscore';
+import _ from 'underscore';
 import { getWADORSImageId } from './getWADORSImageId';
 import { WadoRsMetaDataBuilder } from './classes/metadata/WadoRsMetaDataBuilder';

@@ -1,4 +1,4 @@
-import { $ } from 'meteor/jquery';
+import $ from 'jquery';

 /**
 * Updates the orientation labels on a Cornerstone-enabled Viewport element
@@ -1,6 +1,6 @@
 import { Session } from 'meteor/session';
-import { $ } from 'meteor/jquery';
-import { _ } from 'meteor/underscore';
+import $ from 'jquery';
+import _ from 'underscore';
 // Local Modules
 import { OHIF } from 'meteor/ohif:core';
 import { cornerstone, cornerstoneTools } from 'meteor/ohif:cornerstone';