ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-24 10:45:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'topic-conditionals' into fix-enum-metadata

Browse Source
This commit is contained in:
David Tsay 2020-03-19 20:15:05 -07:00
commit 1f3ec77bf1
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/condition/components/ConditionSet.vue
View File

@ -34,8 +34,10 @@
</div> </div>
</section> </section>
<TestData :is-editing="isEditing" /> <TestData :is-editing="isEditing" />
<ConditionCollection :is-editing="isEditing" <ConditionCollection
@conditionSetResultUpdated="updateCurrentOutput" /> :is-editing="isEditing"
@conditionSetResultUpdated="updateCurrentOutput"
/>
</div> </div>
</template> </template>
@ -60,11 +62,6 @@ export default {
mounted() { mounted() {
this.conditionSetIdentifier = this.openmct.objects.makeKeyString(this.domainObject.identifier); this.conditionSetIdentifier = this.openmct.objects.makeKeyString(this.domainObject.identifier);
}, },
beforeDestroy() {
if (this.stopProvidingTelemetry) {
this.stopProvidingTelemetry();
}
},
methods: { methods: {
updateCurrentOutput(currentConditionResult) { updateCurrentOutput(currentConditionResult) {
this.currentConditionOutput = currentConditionResult.output; this.currentConditionOutput = currentConditionResult.output;