remove checking for isEditing from toolbarProvidersedit-params

3 files changed, 12 insertions, 8 deletions

diff --git a/src/plugins/displayLayout/DisplayLayoutToolbar.js b/src/plugins/displayLayout/DisplayLayoutToolbar.js
index ded2cf91e..5d0880ade 100644
--- a/src/plugins/displayLayout/DisplayLayoutToolbar.js
+++ b/src/plugins/displayLayout/DisplayLayoutToolbar.js
@@ -28,9 +28,9 @@ define([], function () {
             key: "layout",
             description: "A toolbar for objects inside a display layout.",
             forSelection: function (selection) {
-                // Apply the layout toolbar if the edit mode is on, and the selected object
+                // Apply the layout toolbar if the selected object
                 // is inside a layout, or the main layout is selected.
-                return (openmct.editor.isEditing() && selection &&
+                return (selection &&
                     ((selection[1] && selection[1].context.item && selection[1].context.item.type === 'layout') ||
                         (selection[0].context.item && selection[0].context.item.type === 'layout')));
             },
diff --git a/src/plugins/flexibleLayout/toolbarProvider.js b/src/plugins/flexibleLayout/toolbarProvider.js
index a3a98a6a1..245c92642 100644
--- a/src/plugins/flexibleLayout/toolbarProvider.js
+++ b/src/plugins/flexibleLayout/toolbarProvider.js
@@ -29,7 +29,7 @@ function ToolbarProvider(openmct) {
         forSelection: function (selection) {
             let context = selection[0].context;
 
-            return (openmct.editor.isEditing() && context && context.type &&
+            return (context && context.type &&
                 (context.type === 'flexible-layout' || context.type === 'container' || context.type === 'frame'));
         },
         toolbar: function (selection) {
diff --git a/src/ui/layout/Layout.vue b/src/ui/layout/Layout.vue
index 1c35dffba..25d4cfce7 100644
--- a/src/ui/layout/Layout.vue
+++ b/src/ui/layout/Layout.vue
@@ -296,11 +296,8 @@
             Toolbar
         },
         mounted() {
-            this.openmct.editor.on('isEditing', (isEditing)=>{
-                this.isEditing = isEditing;
-            });
-
             this.openmct.selection.on('change', this.toggleHasToolbar);
+            this.openmct.editor.on('isEditing', this.toggleIsEditing);
         },
         data: function () {
             return {
@@ -312,7 +309,7 @@
         },
         computed: {
             toolbar() {
-                return this.hasToolbar && this.isEditing;
+                return this.isEditing && this.hasToolbar;
             }
         },
         methods: {
@@ -338,7 +335,14 @@
                 }
 
                 this.hasToolbar = structure.length > 0;
+            },
+            toggleIsEditing(isEditing) {
+                this.isEditing = isEditing;
             }
+        },
+        beforeDestroy() {
+            this.openmct.selection.off('change', this.toggleHasToolbar);
+            this.openmct.editor.off('isEditing', this.toggleIsEditing);
         }
     }
 </script>