From 952085fee777f2c046bb734049ce07293a53b34c Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Tue, 26 May 2020 10:09:24 +0100 Subject: [PATCH] Switch to View tab on connect --- src/components/appContent.vue | 11 ++++++++++- src/components/viewComponents/connectDisplay.vue | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/components/appContent.vue b/src/components/appContent.vue index 78dded2a..61c990c5 100644 --- a/src/components/appContent.vue +++ b/src/components/appContent.vue @@ -244,7 +244,16 @@ export default { ); }, - mounted: function() {}, + mounted() { + // A global signal listener to switch tab + this.$root.$on("globalSwitchTab", tabID => { + this.currentTab = tabID; + }); + // A global signal listener to the first primary tab + this.$root.$on("globalSwitchTabPrimary", () => { + this.currentTab = "view"; + }); + }, beforeDestroy() { // Then we call that function here to unwatch diff --git a/src/components/viewComponents/connectDisplay.vue b/src/components/viewComponents/connectDisplay.vue index a11f8738..b9c1c5e5 100644 --- a/src/components/viewComponents/connectDisplay.vue +++ b/src/components/viewComponents/connectDisplay.vue @@ -283,6 +283,8 @@ export default { this.$store.commit("setConnected"); // Check client and server match this.checkServerVersion(); + // Switch tab away from connect + this.$root.$emit("globalSwitchTabPrimary"); } else { // Error and no-connect if API v2 is missing var ApiVersionError = `Your microscope is running an old API version.\