ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-05-12 21:43:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removes preventNone as per conversation with UX designer.

Browse Source
This commit is contained in:
Joshi 2020-04-08 11:46:12 -07:00
parent f510f3edd0
commit 73b0fc6f79
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/condition/components/inspector/ConditionalStylesView.vue
View File

@ -33,7 +33,6 @@
<style-editor class="c-inspect-styles__editor" <style-editor class="c-inspect-styles__editor"
:style-item="staticStyle" :style-item="staticStyle"
:is-editing="isEditing" :is-editing="isEditing"
:prevent-none="preventNone"
@persist="updateStaticStyle" @persist="updateStaticStyle"
/> />
</div> </div>
@ -127,8 +126,7 @@ export default {
isEditing: this.openmct.editor.isEditing(), isEditing: this.openmct.editor.isEditing(),
conditions: undefined, conditions: undefined,
conditionsLoaded: false, conditionsLoaded: false,
navigateToPath: '', navigateToPath: ''
preventNone: false
} }
}, },
destroyed() { destroyed() {
@ -156,9 +154,6 @@ export default {
isItemType(type, item) { isItemType(type, item) {
return item && (item.type === type); return item && (item.type === type);
}, },
isDrawingItem(item) {
return !this.isItemType('subobject-view', item) && !this.isItemType('telemetry-view', item);
},
getDomainObjectFromSelection() { getDomainObjectFromSelection() {
let layoutItem; let layoutItem;
let domainObject; let domainObject;
@ -173,8 +168,9 @@ export default {
domainObject = item; domainObject = item;
} else { } else {
domainObject = this.selection[0][1].context.item; domainObject = this.selection[0][1].context.item;
this.itemId = layoutItem.id; if (layoutItem) {
this.preventNone = this.isDrawingItem(layoutItem); this.itemId = layoutItem.id;
}
} }
} else { } else {
domainObject = this.selection[0][0].context.item; domainObject = this.selection[0][0].context.item;

9
src/plugins/condition/components/inspector/StyleEditor.vue
View File

@ -83,9 +83,6 @@ export default {
isEditing: { isEditing: {
type: Boolean type: Boolean
}, },
preventNone: {
type: Boolean
},
styleItem: { styleItem: {
type: Object, type: Object,
required: true required: true
@ -107,8 +104,7 @@ export default {
title: STYLE_CONSTANTS.borderColorTitle, title: STYLE_CONSTANTS.borderColorTitle,
value: this.normalizeValue(value), value: this.normalizeValue(value),
property: 'border', property: 'border',
isEditing: this.isEditing, isEditing: this.isEditing
preventNone: this.preventNone
} }
}, },
backgroundColorOption() { backgroundColorOption() {
@ -118,8 +114,7 @@ export default {
title: STYLE_CONSTANTS.backgroundColorTitle, title: STYLE_CONSTANTS.backgroundColorTitle,
value: this.normalizeValue(value), value: this.normalizeValue(value),
property: 'backgroundColor', property: 'backgroundColor',
isEditing: this.isEditing, isEditing: this.isEditing
preventNone: this.preventNone
} }
}, },
colorOption() { colorOption() {