ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-21 08:39:59 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'master' into topic-conditionals

Browse Source
This commit is contained in:
David Tsay
2020-03-30 11:19:45 -07:00
parent 84874f22e6 a5326a7b95
commit 9e12203b86
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/displayLayout/DisplayLayoutToolbar.js
View File

@ -464,6 +464,10 @@ define(['lodash'], function (_) {
let selectedParent = selectionPath[1].context.item;
let layoutItem = selectionPath[0].context.layoutItem;
if (!layoutItem) {
return;
}
if (layoutItem.type === 'subobject-view') {
if (toolbar['add-menu'].length === 0 && selectionPath[0].context.item.type === 'layout') {
toolbar['add-menu'] = [getAddButton(selectedObjects, selectionPath)];

8
src/plugins/displayLayout/components/AlphanumericFormatView.vue
View File

@ -85,7 +85,13 @@ export default {
return;
}
let format = selection[0][0].context.layoutItem.format;
let layoutItem = selection[0][0].context.layoutItem;
if (!layoutItem) {
return;
}
let format = layoutItem.format;
this.nonMixedFormat = selection.every(selectionPath => {
return selectionPath[0].context.layoutItem.format === format;
});