Skip to content

Commit 012bba4

Browse files
committed
Update Cornerstone libraries and use injection for $, Hammer, and Cornerstone
1 parent 315ec93 commit 012bba4

6 files changed

Lines changed: 21 additions & 9 deletions

Packages/ohif-cornerstone/main.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,21 @@ import * as cornerstoneTools from 'cornerstone-tools';
1313
import * as cornerstoneMath from 'cornerstone-math';
1414
import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader';
1515
import * as dicomParser from 'dicom-parser';
16+
import { $ } from 'meteor/jquery';
17+
import Hammer from 'hammerjs';
1618

1719
import './client/'; // which is actually: import './client/index.js';
1820

21+
// Inject the current cornerstone version into the
22+
// WADO Image Loader and Tools libraries
23+
//
24+
// Note: You would also need to do this with Cornerstone Web Image Loader
25+
cornerstone.external.$ = $;
26+
cornerstoneTools.external.$ = $;
27+
cornerstoneTools.external.Hammer = Hammer;
28+
cornerstoneTools.external.cornerstone = cornerstone;
29+
cornerstoneWADOImageLoader.external.cornerstone = cornerstone;
30+
1931
export {
2032
cornerstone,
2133
cornerstoneTools,

Packages/ohif-cornerstone/package.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ Package.describe({
77
Npm.depends({
88
hammerjs: '2.0.8',
99
'jquery-hammerjs': '2.0.0',
10-
'cornerstone-core': '0.12.2',
11-
'cornerstone-tools': '0.9.0',
10+
'cornerstone-core': '0.13.2',
11+
'cornerstone-tools': '0.10.0',
1212
'cornerstone-math': '0.1.6',
1313
'dicom-parser': '1.7.5',
14-
'cornerstone-wado-image-loader': '0.14.7'
14+
'cornerstone-wado-image-loader': '0.15.1'
1515
});
1616

1717
Package.onUse(function(api) {
@@ -23,7 +23,7 @@ Package.onUse(function(api) {
2323

2424
api.addAssets('public/js/cornerstoneWADOImageLoaderCodecs.es5.js', 'client');
2525
api.addAssets('public/js/cornerstoneWADOImageLoaderWebWorker.es5.js', 'client');
26-
api.addAssets('public/js/cornerstoneWADOImageLoaderWebWorker.min.js.map', 'client');
26+
api.addAssets('public/js/cornerstoneWADOImageLoaderWebWorker.es5.js.map', 'client');
2727

2828
api.mainModule('main.js', 'client');
2929

Packages/ohif-cornerstone/public/js/cornerstoneWADOImageLoaderCodecs.es5.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Packages/ohif-cornerstone/public/js/cornerstoneWADOImageLoaderWebWorker.es5.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Packages/ohif-cornerstone/public/js/cornerstoneWADOImageLoaderWebWorker.es5.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Packages/ohif-cornerstone/public/js/cornerstoneWADOImageLoaderWebWorker.min.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)