Merge branch 'topic-conditionals' into dave/conditions-telemetry

This commit is contained in:
David Tsay
2020-03-17 12:00:57 -07:00

View File

@ -36,7 +36,7 @@ export default class ConditionManager extends EventEmitter {
this.initialize(); this.initialize();
this.stopObservingForChanges = this.openmct.objects.observe(this.conditionSetDomainObject, '*', (newDomainObject) => { this.stopObservingForChanges = this.openmct.objects.observe(this.conditionSetDomainObject, '*', (newDomainObject) => {
this.update(newDomainObject); this.conditionSetDomainObject = newDomainObject;
}); });
this.subscribeToTelemetry(); this.subscribeToTelemetry();
@ -56,15 +56,6 @@ export default class ConditionManager extends EventEmitter {
} }
} }
update(newDomainObject) {
this.destroy();
this.conditionSetDomainObject = newDomainObject;
this.stopObservingForChanges = this.openmct.objects.observe(this.conditionSetDomainObject, '*', (newDO) => {
this.update(newDO);
});
this.initialize();
}
updateCondition(conditionConfiguration, index) { updateCondition(conditionConfiguration, index) {
let condition = this.conditionClassCollection[index]; let condition = this.conditionClassCollection[index];
condition.update(conditionConfiguration); condition.update(conditionConfiguration);