diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-04-03 22:04:11 -0400 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-04-03 22:06:37 -0400 |
| commit | 3eeb53ff63a5e776327a9fd067d0c74b9dc727f4 (patch) | |
| tree | 9b4ee01e1aaf1ab7b4a24ab897ccf14e1aa19a40 /packages/frontend/src/pages/chat/message.vue | |
| parent | refactor bubble-timeline.ts to match global-timeline.ts and local-timeline.ts (diff) | |
| parent | New Crowdin updates (#15740) (diff) | |
| download | sharkey-3eeb53ff63a5e776327a9fd067d0c74b9dc727f4.tar.gz sharkey-3eeb53ff63a5e776327a9fd067d0c74b9dc727f4.tar.bz2 sharkey-3eeb53ff63a5e776327a9fd067d0c74b9dc727f4.zip | |
Merge branch 'misskey-develop' into merge/2025-03-24
# Conflicts:
# package.json
# packages/backend/src/core/AccountMoveService.ts
# packages/frontend/src/components/MkDateSeparatedList.vue
# packages/misskey-js/etc/misskey-js.api.md
# pnpm-lock.yaml
Diffstat (limited to 'packages/frontend/src/pages/chat/message.vue')
| -rw-r--r-- | packages/frontend/src/pages/chat/message.vue | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/packages/frontend/src/pages/chat/message.vue b/packages/frontend/src/pages/chat/message.vue index 975d1a2be9..3ac90a93fd 100644 --- a/packages/frontend/src/pages/chat/message.vue +++ b/packages/frontend/src/pages/chat/message.vue @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only <template> <PageWithHeader> <MkSpacer :contentMax="700"> - <div v-if="initializing"> + <div v-if="initializing || message == null"> <MkLoading/> </div> <div v-else> @@ -17,23 +17,19 @@ SPDX-License-Identifier: AGPL-3.0-only </template> <script lang="ts" setup> -import { ref, useTemplateRef, computed, watch, onMounted, nextTick, onBeforeUnmount, onDeactivated, onActivated } from 'vue'; +import { ref, onMounted } from 'vue'; import * as Misskey from 'misskey-js'; import XMessage from './XMessage.vue'; -import * as os from '@/os.js'; -import { useStream } from '@/stream.js'; import { i18n } from '@/i18n.js'; -import { ensureSignin } from '@/i.js'; import { misskeyApi } from '@/utility/misskey-api.js'; import { definePage } from '@/page.js'; -import MkButton from '@/components/MkButton.vue'; const props = defineProps<{ messageId?: string; }>(); const initializing = ref(true); -const message = ref<Misskey.entities.ChatMessage>(); +const message = ref<Misskey.entities.ChatMessage | null>(); async function initialize() { initializing.value = true; |