Update Cornerstone libraries and use injection for $, Hammer, and Cor…

…nerstone

Packages/ohif-cornerstone/main.js

@@ -13,9 +13,21 @@ import * as cornerstoneTools from 'cornerstone-tools';
 import * as cornerstoneMath from 'cornerstone-math';
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader';
 import * as dicomParser from 'dicom-parser';
+import { $ } from 'meteor/jquery';
+import Hammer from 'hammerjs';
 
 import './client/'; // which is actually: import './client/index.js';
 
+// Inject the current cornerstone version into the
+// WADO Image Loader and Tools libraries
+//
+// Note: You would also need to do this with Cornerstone Web Image Loader
+cornerstone.external.$ = $;
+cornerstoneTools.external.$ = $;
+cornerstoneTools.external.Hammer = Hammer;
+cornerstoneTools.external.cornerstone = cornerstone;
+cornerstoneWADOImageLoader.external.cornerstone = cornerstone;
+
 export {
     cornerstone,
     cornerstoneTools,

Packages/ohif-cornerstone/package.js

@@ -7,11 +7,11 @@ Package.describe({
 Npm.depends({
     hammerjs: '2.0.8',
     'jquery-hammerjs': '2.0.0',
-    'cornerstone-core': '0.12.2',
-    'cornerstone-tools': '0.9.0',
+    'cornerstone-core': '0.13.2',
+    'cornerstone-tools': '0.10.0',
     'cornerstone-math': '0.1.6',
     'dicom-parser': '1.7.5',
-    'cornerstone-wado-image-loader': '0.14.7'
+    'cornerstone-wado-image-loader': '0.15.1'
 });
 
 Package.onUse(function(api) {
@@ -23,7 +23,7 @@ Package.onUse(function(api) {
 
     api.addAssets('public/js/cornerstoneWADOImageLoaderCodecs.es5.js', 'client');
     api.addAssets('public/js/cornerstoneWADOImageLoaderWebWorker.es5.js', 'client');
-    api.addAssets('public/js/cornerstoneWADOImageLoaderWebWorker.min.js.map', 'client');
+    api.addAssets('public/js/cornerstoneWADOImageLoaderWebWorker.es5.js.map', 'client');
 
     api.mainModule('main.js', 'client');