MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-18 22:33:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix 404 handling in main dialog

Browse Source
This commit is contained in:
pa
2026-01-26 15:05:19 +09:00
committed by Natsumi
parent 27f913552e
commit 0a3597f84e
6 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/dialogs/MainDialogContainer.vue
View File

@@ -98,12 +98,7 @@
get: () => activeComponent.value !== null,
set: (value) => {
if (!value) {
userStore.userDialog.visible = false;
worldStore.worldDialog.visible = false;
avatarStore.avatarDialog.visible = false;
groupStore.groupDialog.visible = false;
instanceStore.hidePreviousInstancesDialogs();
uiStore.clearDialogCrumbs();
uiStore.closeMainDialog();
}
}
});
@@ -177,7 +172,7 @@
</script>
<template>
<Dialog v-model:open="isOpen">
<Dialog v-if="isOpen" v-model:open="isOpen">
<DialogContent :class="dialogClass" style="top: 10vh" :show-close-button="false">
<Breadcrumb v-if="shouldShowBreadcrumbs" class="mb-2">
<BreadcrumbList>

2
src/stores/avatar.js
View File

@@ -216,7 +216,7 @@ export const useAvatarStore = defineStore('Avatar', () => {
ref2.authorId !== userStore.currentUser.id
) {
D.loading = false;
D.visible = false;
uiStore.closeMainDialog();
return;
}
}

2
src/stores/group.js
View File

@@ -164,7 +164,7 @@ export const useGroupStore = defineStore('Group', () => {
})
.catch((err) => {
D.loading = false;
D.visible = false;
uiStore.closeMainDialog();
toast.error(t('message.group.load_failed'));
throw err;
})

16
src/stores/ui.js
View File

@@ -112,6 +112,21 @@ export const useUiStore = defineStore('Ui', () => {
dialogCrumbs.value = [];
}
function closeMainDialog() {
const userStore = useUserStore();
const worldStore = useWorldStore();
const avatarStore = useAvatarStore();
const groupStore = useGroupStore();
const instanceStore = useInstanceStore();
userStore.userDialog.visible = false;
worldStore.worldDialog.visible = false;
avatarStore.avatarDialog.visible = false;
groupStore.groupDialog.visible = false;
instanceStore.hidePreviousInstancesDialogs();
clearDialogCrumbs();
}
function openDialog({ type, id, label = '', skipBreadcrumb = false }) {
const userStore = useUserStore();
const worldStore = useWorldStore();
@@ -244,6 +259,7 @@ export const useUiStore = defineStore('Ui', () => {
setDialogCrumbLabel,
jumpDialogCrumb,
clearDialogCrumbs,
closeMainDialog,
openDialog
};
});

2
src/stores/user.js
View File

@@ -845,7 +845,7 @@ export const useUserStore = defineStore('User', () => {
})
.catch((err) => {
D.loading = false;
D.visible = false;
uiStore.closeMainDialog();
toast.error(t('message.user.load_failed'));
throw err;
})

2
src/stores/world.js
View File

@@ -146,7 +146,7 @@ export const useWorldStore = defineStore('World', () => {
})
.catch((err) => {
D.loading = false;
D.visible = false;
uiStore.closeMainDialog();
toast.error(t('message.world.load_failed'));
throw err;
})