summaryrefslogtreecommitdiff
path: root/packages/frontend/src/components/DynamicNote.vue
diff options
context:
space:
mode:
authorpiuvas <mail@piuvas.net>2025-06-03 10:56:10 -0300
committerpiuvas <mail@piuvas.net>2025-06-03 10:56:10 -0300
commit1120ad19ae16969e552d895c72ee802f47d26c25 (patch)
treeaa4a13d4cf5c508a215d2faca56123eb44ac21aa /packages/frontend/src/components/DynamicNote.vue
parentcheck for whitespace in instance mutes. (diff)
parentmerge: allow fragments in AP ID URLs - fixes polls (!1076) (diff)
downloadsharkey-1120ad19ae16969e552d895c72ee802f47d26c25.tar.gz
sharkey-1120ad19ae16969e552d895c72ee802f47d26c25.tar.bz2
sharkey-1120ad19ae16969e552d895c72ee802f47d26c25.zip
merge develop and fix conflicts.
Diffstat (limited to 'packages/frontend/src/components/DynamicNote.vue')
-rw-r--r--packages/frontend/src/components/DynamicNote.vue8
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/frontend/src/components/DynamicNote.vue b/packages/frontend/src/components/DynamicNote.vue
index a5008e9ddf..67707bfda9 100644
--- a/packages/frontend/src/components/DynamicNote.vue
+++ b/packages/frontend/src/components/DynamicNote.vue
@@ -23,10 +23,10 @@ import type MkNote from '@/components/MkNote.vue';
import type SkNote from '@/components/SkNote.vue';
import { prefer } from '@/preferences';
-const XNote = computed(() =>
- prefer.r.noteDesign.value === 'misskey'
- ? defineAsyncComponent(() => import('@/components/MkNote.vue'))
- : defineAsyncComponent(() => import('@/components/SkNote.vue')),
+const XNote = defineAsyncComponent(() =>
+ prefer.s.noteDesign === 'misskey'
+ ? import('@/components/MkNote.vue')
+ : import('@/components/SkNote.vue')
);
const rootEl = useTemplateRef<ComponentExposed<typeof MkNote | typeof SkNote>>('rootEl');