wip on react transition 8
This commit is contained in:
1 parent
9ae5dd25ce
commit
71b49e6766
35 files changed
+818
-470
No files matched your search
@@ -151,7 +151,7 @@ Template.protocolEditor.helpers({
|
||||
return ProtocolEngine.getCurrentStageModel();
|
||||
},
|
||||
activeViewportUndefined() {
|
||||
const viewportIndex = Session.get('activeViewport');
|
||||
const viewportIndex = window.store.getState().viewports.activeViewport;
|
||||
return (viewportIndex === undefined);
|
||||
}
|
||||
});
|
||||
|
||||
+1
-1
@@ -318,7 +318,7 @@ Template.ruleEntryDialog.events({
|
||||
rule.constraint = constraint;
|
||||
|
||||
// Instruct the Protocol Engine to update the Layout Manager with new data
|
||||
var viewportIndex = Session.get('activeViewport');
|
||||
var viewportIndex = window.store.getState().viewports.activeViewport;
|
||||
ProtocolEngine.updateViewports(viewportIndex);
|
||||
|
||||
// Close the dialog
|
||||
|
||||
@@ -6,7 +6,7 @@ Template.ruleTable.helpers({
|
||||
*/
|
||||
rulePassed: function() {
|
||||
// Retrieve the latest match details given the active viewport index
|
||||
var viewportIndex = Session.get('activeViewport');
|
||||
var viewportIndex = window.store.getState().viewports.activeViewport;
|
||||
var details = ProtocolEngine.matchDetails[viewportIndex];
|
||||
|
||||
// If no match was found, stop here
|
||||
@@ -92,7 +92,7 @@ Template.ruleTable.events({
|
||||
}
|
||||
|
||||
// Instruct the Protocol Engine to update the Layout Manager with new data
|
||||
var viewportIndex = Session.get('activeViewport');
|
||||
var viewportIndex = window.store.getState().viewports.activeViewport;
|
||||
ProtocolEngine.updateViewports(viewportIndex);
|
||||
},
|
||||
/**
|
||||
@@ -108,7 +108,7 @@ Template.ruleTable.events({
|
||||
rule.weight = $(event.currentTarget).val();
|
||||
|
||||
// Instruct the Protocol Engine to update the Layout Manager with new data
|
||||
var viewportIndex = Session.get('activeViewport');
|
||||
var viewportIndex = window.store.getState().viewports.activeViewport;
|
||||
ProtocolEngine.updateViewports(viewportIndex);
|
||||
},
|
||||
/**
|
||||
@@ -124,7 +124,7 @@ Template.ruleTable.events({
|
||||
rule.required = $(event.currentTarget).prop('checked');
|
||||
|
||||
// Instruct the Protocol Engine to update the Layout Manager with new data
|
||||
var viewportIndex = Session.get('activeViewport');
|
||||
var viewportIndex = window.store.getState().viewports.activeViewport;
|
||||
ProtocolEngine.updateViewports(viewportIndex);
|
||||
}
|
||||
});
|
||||
+2
-2
@@ -165,7 +165,7 @@ Template.settingEntryDialog.events({
|
||||
viewport.viewportSettings[viewportSetting.id] = viewportSetting.value;
|
||||
|
||||
// Instruct the Protocol Engine to update the Layout Manager with new data
|
||||
var viewportIndex = Session.get('activeViewport');
|
||||
var viewportIndex = window.store.getState().viewports.activeViewport;
|
||||
ProtocolEngine.updateViewports(viewportIndex);
|
||||
|
||||
// Close the dialog
|
||||
@@ -176,7 +176,7 @@ Template.settingEntryDialog.events({
|
||||
*/
|
||||
'click #cancel': function() {
|
||||
var dialog = Template.settingEntryDialog.dialog;
|
||||
closeHandler(dialog);
|
||||
closeHandler(dialog);
|
||||
},
|
||||
/**
|
||||
* Allow Esc keydown events to close the dialog
|
||||
|
||||
@@ -37,7 +37,7 @@ Template.settingsTable.events({
|
||||
delete viewport.viewportSettings[setting.key];
|
||||
|
||||
// Instruct the Protocol Engine to update the Layout Manager with new data
|
||||
var viewportIndex = Session.get('activeViewport');
|
||||
var viewportIndex = window.store.getState().viewports.activeViewport;
|
||||
ProtocolEngine.updateViewports(viewportIndex);
|
||||
}
|
||||
});
|
||||
@@ -54,4 +54,4 @@ Template.settingsTable.helpers({
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
});
|
||||
@@ -11,7 +11,7 @@ getActiveViewportModel = function() {
|
||||
var stage = ProtocolEngine.getCurrentStageModel();
|
||||
|
||||
// Retrieve the index of the active viewport
|
||||
var activeViewport = Session.get('activeViewport');
|
||||
var activeViewport = window.store.getState().viewports.activeViewport;
|
||||
|
||||
// If the active viewport index is outside the bounds of the
|
||||
// number of Viewports defined for this Stage, stop here
|
||||
|
||||
Reference in new issue
Block a user