diff --git a/src/plugins/displayLayout/DisplayLayoutToolbar.js b/src/plugins/displayLayout/DisplayLayoutToolbar.js index ff03d23fe3..707c49327c 100644 --- a/src/plugins/displayLayout/DisplayLayoutToolbar.js +++ b/src/plugins/displayLayout/DisplayLayoutToolbar.js @@ -520,6 +520,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)]; diff --git a/src/plugins/displayLayout/components/AlphanumericFormatView.vue b/src/plugins/displayLayout/components/AlphanumericFormatView.vue index d858b7a052..2207d09d2c 100644 --- a/src/plugins/displayLayout/components/AlphanumericFormatView.vue +++ b/src/plugins/displayLayout/components/AlphanumericFormatView.vue @@ -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; }); diff --git a/src/ui/components/ObjectView.vue b/src/ui/components/ObjectView.vue index 08be3ae443..6a97b9adcf 100644 --- a/src/ui/components/ObjectView.vue +++ b/src/ui/components/ObjectView.vue @@ -155,7 +155,7 @@ export default { return this.composition.load(); }, getSelectionContext() { - if (this.currentView.getSelectionContext) { + if (this.currentView && this.currentView.getSelectionContext) { return this.currentView.getSelectionContext(); } else { return { item: this.currentObject };