Removes preventNone as per conversation with UX designer.

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

View File

@ -33,7 +33,6 @@
<style-editor class="c-inspect-styles__editor"
:style-item="staticStyle"
:is-editing="isEditing"
:prevent-none="preventNone"
@persist="updateStaticStyle"
/>
</div>
@ -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;

View File

@ -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() {