diff --git a/src/plugins/condition/components/inspector/ConditionalStylesView.vue b/src/plugins/condition/components/inspector/ConditionalStylesView.vue index 7a978d2e23..a960790f87 100644 --- a/src/plugins/condition/components/inspector/ConditionalStylesView.vue +++ b/src/plugins/condition/components/inspector/ConditionalStylesView.vue @@ -33,7 +33,6 @@ @@ -127,8 +126,7 @@ export default { isEditing: this.openmct.editor.isEditing(), conditions: undefined, conditionsLoaded: false, - navigateToPath: '', - preventNone: false + navigateToPath: '' } }, destroyed() { @@ -156,9 +154,6 @@ export default { isItemType(type, item) { return item && (item.type === type); }, - isDrawingItem(item) { - return !this.isItemType('subobject-view', item) && !this.isItemType('telemetry-view', item); - }, getDomainObjectFromSelection() { let layoutItem; let domainObject; @@ -173,8 +168,9 @@ export default { domainObject = item; } else { domainObject = this.selection[0][1].context.item; - this.itemId = layoutItem.id; - this.preventNone = this.isDrawingItem(layoutItem); + if (layoutItem) { + this.itemId = layoutItem.id; + } } } else { domainObject = this.selection[0][0].context.item; diff --git a/src/plugins/condition/components/inspector/StyleEditor.vue b/src/plugins/condition/components/inspector/StyleEditor.vue index 8552800f61..1828d67348 100644 --- a/src/plugins/condition/components/inspector/StyleEditor.vue +++ b/src/plugins/condition/components/inspector/StyleEditor.vue @@ -83,9 +83,6 @@ export default { isEditing: { type: Boolean }, - preventNone: { - type: Boolean - }, styleItem: { type: Object, required: true @@ -107,8 +104,7 @@ export default { title: STYLE_CONSTANTS.borderColorTitle, value: this.normalizeValue(value), property: 'border', - isEditing: this.isEditing, - preventNone: this.preventNone + isEditing: this.isEditing } }, backgroundColorOption() { @@ -118,8 +114,7 @@ export default { title: STYLE_CONSTANTS.backgroundColorTitle, value: this.normalizeValue(value), property: 'backgroundColor', - isEditing: this.isEditing, - preventNone: this.preventNone + isEditing: this.isEditing } }, colorOption() {