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

fix errors when navigated away from a layout that uses toolbar

Browse Source
This commit is contained in:
Deep Tailor
2020-03-27 10:15:09 -07:00
parent eedc0f13bc
commit 6b00af6ece
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

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

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

@ -85,7 +85,13 @@ export default {
return; 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 => { this.nonMixedFormat = selection.every(selectionPath => {
return selectionPath[0].context.layoutItem.format === format; return selectionPath[0].context.layoutItem.format === format;
}); });

2
src/ui/components/ObjectView.vue
View File

@ -155,7 +155,7 @@ export default {
return this.composition.load(); return this.composition.load();
}, },
getSelectionContext() { getSelectionContext() {
if (this.currentView.getSelectionContext) { if (this.currentView && this.currentView.getSelectionContext) {
return this.currentView.getSelectionContext(); return this.currentView.getSelectionContext();
} else { } else {
return { item: this.currentObject }; return { item: this.currentObject };