usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(frontend): デッキモードかつ直接/以外を表示したときにデッキが表示されない問題を修正 

Fix #10905
This commit is contained in:
tamaina 2023-05-27 12:01:00 +00:00
parent fb54c58a66
commit 16b50fc6a9
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/frontend/src/boot/main-boot.ts
View File

@ -16,7 +16,7 @@ import { initializeSw } from '@/scripts/initialize-sw';
export async function mainBoot() {
const { isClientUpdated } = await common(() => createApp(
new URLSearchParams(window.location.search).has('zen') || (ui === 'deck' && location.pathname !== '/') ? defineAsyncComponent(() => import('@/ui/zen.vue')) :
new URLSearchParams(window.location.search).has('zen') ? defineAsyncComponent(() => import('@/ui/zen.vue')) :
!$i ? defineAsyncComponent(() => import('@/ui/visitor.vue')) :
ui === 'deck' ? defineAsyncComponent(() => import('@/ui/deck.vue')) :
ui === 'classic' ? defineAsyncComponent(() => import('@/ui/classic.vue')) :

8
packages/frontend/src/ui/deck.vue
View File

@ -130,6 +130,14 @@ mainRouter.navHook = (path, flag): boolean => {
return false;
};
if (mainRouter.currentRoute.value.path !== '/') {
const noMainColumn = !deckStore.state.columns.some(x => x.type === 'main');
if (deckStore.state.navWindow || noMainColumn) {
os.pageWindow(mainRouter.currentRoute.value.path);
mainRouter.replace('/');
}
}
const isMobile = ref(window.innerWidth <= 500);
window.addEventListener('resize', () => {
isMobile.value = window.innerWidth <= 500;