OHIF #83 Do not assign state reactive-dict to template data since template data is overwritten and previous state is lost when router is called multiple times

This commit is contained in:
Aysel Afsar committed 2017-08-12 09:25:53 -04:00
1 parent 2c38921385
commit b928051e10
6 files changed
+41 -24

No files matched your search

@@ -55,9 +55,9 @@ Template.viewer.onCreated(() => {
ValidationErrors.remove({});
instance.data.state = new ReactiveDict();
instance.data.state.set('leftSidebar', Session.get('leftSidebar'));
instance.data.state.set('rightSidebar', Session.get('rightSidebar'));
instance.state = new ReactiveDict();
instance.state.set('leftSidebar', Session.get('leftSidebar'));
instance.state.set('rightSidebar', Session.get('rightSidebar'));
const viewportUtils = OHIF.viewerbase.viewportUtils;
@@ -286,14 +286,14 @@ const setActiveToolAndSidebar = () => {
}
// Toggle Measurement Table
if (instance.data.state) {
instance.data.state.set('rightSidebar', 'measurements');
if (instance.state) {
instance.state.set('rightSidebar', 'measurements');
}
}
// Hide as default for single study
else {
if (instance.data.state) {
instance.data.state.set('rightSidebar', null);
if (instance.state) {
instance.state.set('rightSidebar', null);
}
}
};
@@ -351,6 +351,10 @@ Template.viewer.helpers({
const ready = Session.get('TimepointsReady') && Session.get('MeasurementsReady');
OHIF.log.info('dataSourcesReady? : ' + ready);
return ready;
},
state() {
return Template.instance().state;
}
});