Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feat-1714' of https://github.com/kakkokari-gtyih/misskey into pr/13929

Browse source
This commit is contained in:
syuilo 2024-08-20 16:26:07 +09:00
parent 54a6fbed15 e4ef400923
commit c342286778
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
packages/frontend/src/embed/ui/timeline.vue → packages/frontend/src/embed/components/MkEmTimelineContainer.vue
View file

6
packages/frontend/src/embed/pages/clip.vue
View file

@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template> <template>
<div> <div>
<MkLoading v-if="loading"/> <MkLoading v-if="loading"/>
<XEmTimelineUI v-else-if="clip" :showHeader="embedParams.header"> <MkEmTimelineContainer v-else-if="clip" :showHeader="embedParams.header">
<template #header> <template #header>
<div :class="$style.clipHeader"> <div :class="$style.clipHeader">
<div :class="$style.headerClipIconRoot"> <div :class="$style.headerClipIconRoot">
@ -33,7 +33,7 @@ SPDX-License-Identifier: AGPL-3.0-only
:ad="false" :ad="false"
/> />
</template> </template>
</XEmTimelineUI> </MkEmTimelineContainer>
<XNotFound v-else/> <XNotFound v-else/>
</div> </div>
</template> </template>
@ -43,7 +43,7 @@ import { ref, computed, shallowRef, inject, onActivated } from 'vue';
import * as Misskey from 'misskey-js'; import * as Misskey from 'misskey-js';
import MkNotes from '@/components/MkNotes.vue'; import MkNotes from '@/components/MkNotes.vue';
import XNotFound from '@/pages/not-found.vue'; import XNotFound from '@/pages/not-found.vue';
import XEmTimelineUI from '@/embed/ui/timeline.vue'; import MkEmTimelineContainer from '@/embed/components/MkEmTimelineContainer.vue';
import type { Paging } from '@/components/MkPagination.vue'; import type { Paging } from '@/components/MkPagination.vue';
import { misskeyApi } from '@/scripts/misskey-api.js'; import { misskeyApi } from '@/scripts/misskey-api.js';
import { i18n } from '@/i18n.js'; import { i18n } from '@/i18n.js';

6
packages/frontend/src/embed/pages/tag.vue
View file

@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template> <template>
<div> <div>
<XEmTimelineUI v-if="tag" :showHeader="embedParams.header"> <MkEmTimelineContainer v-if="tag" :showHeader="embedParams.header">
<template #header> <template #header>
<div :class="$style.clipHeader"> <div :class="$style.clipHeader">
<div :class="$style.headerClipIconRoot"> <div :class="$style.headerClipIconRoot">
@ -32,7 +32,7 @@ SPDX-License-Identifier: AGPL-3.0-only
:ad="false" :ad="false"
/> />
</template> </template>
</XEmTimelineUI> </MkEmTimelineContainer>
<XNotFound v-else/> <XNotFound v-else/>
</div> </div>
</template> </template>
@ -41,7 +41,7 @@ SPDX-License-Identifier: AGPL-3.0-only
import { computed, shallowRef, inject, onActivated } from 'vue'; import { computed, shallowRef, inject, onActivated } from 'vue';
import MkNotes from '@/components/MkNotes.vue'; import MkNotes from '@/components/MkNotes.vue';
import XNotFound from '@/pages/not-found.vue'; import XNotFound from '@/pages/not-found.vue';
import XEmTimelineUI from '@/embed/ui/timeline.vue'; import MkEmTimelineContainer from '@/embed/components/MkEmTimelineContainer.vue';
import type { Paging } from '@/components/MkPagination.vue'; import type { Paging } from '@/components/MkPagination.vue';
import { i18n } from '@/i18n.js'; import { i18n } from '@/i18n.js';
import { instance } from '@/instance.js'; import { instance } from '@/instance.js';

6
packages/frontend/src/embed/pages/user-timeline.vue
View file

@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template> <template>
<div> <div>
<MkLoading v-if="loading"/> <MkLoading v-if="loading"/>
<XEmTimelineUI v-else-if="user" :showHeader="embedParams.header"> <MkEmTimelineContainer v-else-if="user" :showHeader="embedParams.header">
<template #header> <template #header>
<div :class="$style.userHeader"> <div :class="$style.userHeader">
<a :href="`/@${user.username}`" target="_blank" rel="noopener noreferrer" :class="$style.avatarLink"> <a :href="`/@${user.username}`" target="_blank" rel="noopener noreferrer" :class="$style.avatarLink">
@ -40,7 +40,7 @@ SPDX-License-Identifier: AGPL-3.0-only
:ad="false" :ad="false"
/> />
</template> </template>
</XEmTimelineUI> </MkEmTimelineContainer>
<XNotFound v-else/> <XNotFound v-else/>
</div> </div>
</template> </template>
@ -50,7 +50,7 @@ import { ref, computed, shallowRef, inject, onActivated } from 'vue';
import * as Misskey from 'misskey-js'; import * as Misskey from 'misskey-js';
import MkNotes from '@/components/MkNotes.vue'; import MkNotes from '@/components/MkNotes.vue';
import XNotFound from '@/pages/not-found.vue'; import XNotFound from '@/pages/not-found.vue';
import XEmTimelineUI from '@/embed/ui/timeline.vue'; import MkEmTimelineContainer from '@/embed/components/MkEmTimelineContainer.vue';
import type { Paging } from '@/components/MkPagination.vue'; import type { Paging } from '@/components/MkPagination.vue';
import { misskeyApi } from '@/scripts/misskey-api.js'; import { misskeyApi } from '@/scripts/misskey-api.js';
import { i18n } from '@/i18n.js'; import { i18n } from '@/i18n.js';