rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ui_migration fix(deps): replacing global emiters to eventBus.emit, on mixings file.

Browse source
This commit is contained in:
Antonio Anaya 2026-02-12 04:35:38 -06:00
parent a16a86f361
commit 869f410dbb
2 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
webapp/src/components/labThingsComponents/actionButton.vue
View file

@ -136,42 +136,32 @@ export default {
watch: { watch: {
progress: { progress: {
handler(newval) { handler(newval) {
//this.$emit("update:progress", newval);
this.$emit("update:progress", newval); this.$emit("update:progress", newval);
//eventBus.emit("beforeUpdate:progress", newval);
}, },
deep: true, deep: true,
immediate: true // Optional: triggers immediately on component load immediate: true // Optional: triggers immediately on component load
}, },
taskStarted: { taskStarted: {
handler(newval) { handler(newval) {
//this.$emit("update:taskStarted", newval);
this.$emit("update:taskStarted", newval); this.$emit("update:taskStarted", newval);
//eventBus.emit("beforeUpdate:taskStarted", newval);
}, },
deep: true deep: true
}, },
taskRunning: { taskRunning: {
handler(newval) { handler(newval) {
//this.$emit("update:taskRunning", newval);
this.$emit("update:taskRunning", newval); this.$emit("update:taskRunning", newval);
//eventBus.emit("beforeUpdate:taskRunning", newval);
}, },
deep: true deep: true
}, },
log: { log: {
handler(newval) { handler(newval) {
//this.$emit("update:log", newval);
this.$emit("update:log", newval); this.$emit("update:log", newval);
//eventBus.emit("beforeUpdate:log", newval);
}, },
deep: true deep: true
}, },
taskStatus: { taskStatus: {
handler(newval) { handler(newval) {
//this.$emit("update:taskStatus", newval);
this.$emit("update:taskStatus", newval); this.$emit("update:taskStatus", newval);
//eventBus.emit("beforeUpdate:taskStatus", newval);
}, },
deep: true deep: true
} }

7
webapp/src/mixins/modalMixins.js
View file

@ -7,6 +7,7 @@
*/ */
import UIkit from "uikit"; import UIkit from "uikit";
import { eventBus } from "@/eventBus";
export default { export default {
methods: { methods: {
@ -14,7 +15,7 @@ export default {
var context = this; var context = this;
// Stop GPU preview to show modal // Stop GPU preview to show modal
context.$root.$emit("globalTogglePreview", false); eventBus.emit("globalTogglePreview", false);
// force OK to be capitalised // force OK to be capitalised
UIkit.modal.i18n = { ok: "OK", cancel: "Cancel" }; UIkit.modal.i18n = { ok: "OK", cancel: "Cancel" };
@ -33,9 +34,9 @@ export default {
.finally(function () { .finally(function () {
// Re-enable the GPU preview, if it was active before the modal // Re-enable the GPU preview, if it was active before the modal
if (context.$store.state.autoGpuPreview) { if (context.$store.state.autoGpuPreview) {
context.$root.$emit("globalTogglePreview", true); eventBus.emit("globalTogglePreview", true);
} }
context.$root.$emit("modalClosed"); eventBus.emit("modalClosed");
}); });
}; };
return new Promise(showModal); return new Promise(showModal);