Merge branch 'master' into refactor-hide-pane

revert changes
Merge branch 'refactor-hide-pane' of github.com:nasa/openmct into refactor-hide-pane
2021-08-13 08:06:00 -07:00 · 2021-08-12 11:38:25 -07:00 · 2021-08-12 11:37:42 -07:00 · 2021-08-12 11:28:22 -07:00 · 2021-08-12 11:13:51 -07:00 · 2021-08-12 11:12:58 -07:00
1 changed files with 7 additions and 3 deletions
--- a/src/ui/layout/pane.vue
+++ b/src/ui/layout/pane.vue
@@ -78,11 +78,15 @@ export default {
    async mounted() {
        await this.$nextTick();
        // Hide tree and/or inspector pane if specified in URL
-        this.handleHideUrl();
-        this.openmct.router.on('change:params', this.handleHideUrl);
+        if (this.collapsable) {
+            this.handleHideUrl();
+            this.openmct.router.on('change:params', this.handleHideUrl);
+        }
    },
    beforeDestroy() {
-        this.openmct.router.off('change:params', this.handleHideUrl);
+        if (this.collapsable) {
+            this.openmct.router.off('change:params', this.handleHideUrl);
+        }
    },
    methods: {
        toggleCollapse: function (e) {
Author	SHA1	Message	Date
Henry Hsu	bbbcbaaf5f	Merge branch 'master' into refactor-hide-pane	2021-08-13 08:06:00 -07:00
Henry Hsu	ce0f3f03e9	revert changes	2021-08-12 11:38:25 -07:00
Henry Hsu	c077340780	Merge branch 'refactor-hide-pane' of github.com:nasa/openmct into refactor-hide-pane	2021-08-12 11:37:42 -07:00
Henry Hsu	c8c26dea19	Merge branch 'master' of github.com:nasa/openmct into refactor-hide-pane	2021-08-12 11:28:22 -07:00
Henry Hsu	2cba7a8f1e	Merge branch 'refactor-hide-pane' of github.com:nasa/openmct into refactor-hide-pane	2021-08-12 11:13:51 -07:00
Henry Hsu	8c68aab88f	fix conflict	2021-08-12 11:12:58 -07:00
Henry Hsu	5abbfa42aa	Merge branch 'master' into refactor-hide-pane	2021-08-10 15:11:12 -07:00
Henry Hsu	217ecb321f	remove comments	2021-08-10 15:00:27 -07:00
Henry Hsu	c2a78c18ab	remove collapsable prop	2021-08-10 14:52:08 -07:00
Henry Hsu	2477655828	add url param check in layout view	2021-08-10 14:17:22 -07:00
Henry Hsu	f2c024b5ef	Merge branch 'master' of github.com:nasa/openmct into refactor-hide-pane	2021-08-10 08:44:36 -07:00
Henry Hsu	64f0dd4f15	only add/remove router listener for collapsable panes	2021-08-09 10:39:49 -07:00