Enter main app when modals have been closed (83aefe87) · Commits · OpenFlexure / openflexure-microscope-server

src/components/appContent.vue

+11 −14

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@
		<calibrationModal
		ref="calibrationModal"
		:available-plugins="plugins"
		@onClose="enterApp()"
		></calibrationModal>
		<!-- Vertical tab bar -->
		<div
		@@ -226,17 +227,12 @@ export default {
		return getters.ready;
		},
		ready => {
		if (ready) {
		// Update plugins
		this.updatePlugins().then(() => {
		// Start initialisation modals
		this.startModals();
		});

		if (ready) {
		console.log("Left panel now ready");
		} else {
		console.log("Right panel now disabled");
		this.currentTab = "connect";
		}
		}
		);
		@@ -247,10 +243,6 @@ export default {
		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() {
		@@ -281,6 +273,11 @@ export default {
		},
		startModals: function() {
		this.$refs["calibrationModal"].show();
		},
		enterApp: function() {
		// Stuff to do once connected and all init modals are finished
		console.log("Entering main application");
		this.currentTab = "view";
		}
		}
		};

+9 −0

Original line number	Diff line number	Diff line
		@@ -231,6 +231,10 @@ export default {
		}
		},

		mounted() {
		this.$refs["calibrationModalEl"].addEventListener("hidden", this.onHide);
		},

		methods: {
		show: function() {
		// Get current settings
		@@ -258,6 +262,11 @@ export default {
		this.ready = false;
		},

		onHide: function() {
		console.log("UIKit modal hidden");
		this.$emit("onClose");
		},

		getSettings: function() {
		return axios
		.get(this.settingsUri)