TrizTech/ohif-viewer
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(hot-keys): Set the correct context name to enable hot keys based on the current page (#308)

Browse Source
This commit is contained in:
Evren Ozkan 2018-11-09 13:14:03 -05:00
parent 99041bebde
commit 5017fd13af
7 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Packages/ohif-hotkeys/client/index.js
View File

@ -1,2 +1 @@
import './components'; import './components';
import './lib';

1
Packages/ohif-hotkeys/client/lib/index.js
View File

@ -1 +0,0 @@
import './routes';

14
Packages/ohif-hotkeys/client/lib/routes.js
View File

@ -1,14 +0,0 @@
import { Router } from 'meteor/clinical:router';
import { Session } from 'meteor/session';
import { hotkeys } from 'meteor/ohif:hotkeys';
Router.onBeforeAction(function() {
const lastRoute = Session.get('lastRoute');
const currentRoute = this.router.current().route.getName();
if (currentRoute !== lastRoute) {
hotkeys.switchToContext(null);
Session.set('lastRoute', currentRoute);
}
this.next();
});

1
Packages/ohif-study-list/client/components/studylist/index.js
View File

@ -1,4 +1,5 @@
import './studylist.html'; import './studylist.html';
import './studylist.js';
import './studylist.styl'; import './studylist.styl';
import './studylistStudy/studylistStudy.html'; import './studylistStudy/studylistStudy.html';

12
Packages/ohif-study-list/client/components/studylist/studylist.js Normal file
View File

@ -0,0 +1,12 @@
import { Template } from 'meteor/templating';
import { OHIF } from 'meteor/ohif:core';
Template.studylist.onCreated(() => {
// Set the current context
OHIF.context.set('studylist');
});
Template.studylist.onDestroyed(() => {
// Reset the current context
OHIF.context.set(null);
});

6
Packages/ohif-viewerbase/client/components/viewer/viewerMain/viewerMain.js
View File

@ -28,6 +28,9 @@ Template.viewerMain.onCreated(() => {
// Add beforeUnload event handler to check for unsaved changes // Add beforeUnload event handler to check for unsaved changes
window.addEventListener('beforeunload', unloadHandlers.beforeUnload); window.addEventListener('beforeunload', unloadHandlers.beforeUnload);
// Set the current context
OHIF.context.set('viewer');
}); });
Template.viewerMain.onRendered(() => { Template.viewerMain.onRendered(() => {
@ -82,4 +85,7 @@ Template.viewerMain.onDestroyed(() => {
// @TypeSafeStudies // @TypeSafeStudies
// Clears OHIF.viewer.StudyMetadataList collection // Clears OHIF.viewer.StudyMetadataList collection
OHIF.viewer.StudyMetadataList.removeAll(); OHIF.viewer.StudyMetadataList.removeAll();
// Reset the current context
OHIF.context.set(null);
}); });

6
StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.js
View File

@ -18,6 +18,9 @@ Template.standaloneViewerMain.onCreated(() => {
// Metadata configuration // Metadata configuration
const metadataProvider = OHIF.viewer.metadataProvider; const metadataProvider = OHIF.viewer.metadataProvider;
cornerstone.metaData.addProvider(metadataProvider.provider.bind(metadataProvider)); cornerstone.metaData.addProvider(metadataProvider.provider.bind(metadataProvider));
// Set the current context
OHIF.context.set('viewer');
}); });
Template.standaloneViewerMain.onRendered(() => { Template.standaloneViewerMain.onRendered(() => {
@ -58,4 +61,7 @@ Template.standaloneViewerMain.onDestroyed(() => {
// Clear references to all stacks in the StackManager // Clear references to all stacks in the StackManager
OHIF.viewerbase.stackManager.clearStacks(); OHIF.viewerbase.stackManager.clearStacks();
// Reset the current context
OHIF.context.set(null);
}); });