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

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

This commit is contained in:
syuilo 2024-08-20 16:28:17 +09:00
parent bef84d3e5f de535eeae9
commit 8b6f0f204c
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/components/MkEmTimelineContainer.vue → packages/frontend/src/embed/components/EmTimelineContainer.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>
<div>
<MkLoading v-if="loading"/>
<MkEmTimelineContainer v-else-if="clip" :showHeader="embedParams.header">
<EmTimelineContainer v-else-if="clip" :showHeader="embedParams.header">
<template #header>
<div :class="$style.clipHeader">
<div :class="$style.headerClipIconRoot">
@ -33,7 +33,7 @@ SPDX-License-Identifier: AGPL-3.0-only
:ad="false"
/>
</template>
</MkEmTimelineContainer>
</EmTimelineContainer>
<XNotFound v-else/>
</div>
</template>
@ -43,7 +43,7 @@ import { ref, computed, shallowRef, inject, onActivated } from 'vue';
import * as Misskey from 'misskey-js';
import MkNotes from '@/components/MkNotes.vue';
import XNotFound from '@/pages/not-found.vue';
import MkEmTimelineContainer from '@/embed/components/MkEmTimelineContainer.vue';
import EmTimelineContainer from '@/embed/components/EmTimelineContainer.vue';
import type { Paging } from '@/components/MkPagination.vue';
import { misskeyApi } from '@/scripts/misskey-api.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>
<div>
<MkEmTimelineContainer v-if="tag" :showHeader="embedParams.header">
<EmTimelineContainer v-if="tag" :showHeader="embedParams.header">
<template #header>
<div :class="$style.clipHeader">
<div :class="$style.headerClipIconRoot">
@ -32,7 +32,7 @@ SPDX-License-Identifier: AGPL-3.0-only
:ad="false"
/>
</template>
</MkEmTimelineContainer>
</EmTimelineContainer>
<XNotFound v-else/>
</div>
</template>
@ -41,7 +41,7 @@ SPDX-License-Identifier: AGPL-3.0-only
import { computed, shallowRef, inject, onActivated } from 'vue';
import MkNotes from '@/components/MkNotes.vue';
import XNotFound from '@/pages/not-found.vue';
import MkEmTimelineContainer from '@/embed/components/MkEmTimelineContainer.vue';
import EmTimelineContainer from '@/embed/components/EmTimelineContainer.vue';
import type { Paging } from '@/components/MkPagination.vue';
import { i18n } from '@/i18n.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>
<div>
<MkLoading v-if="loading"/>
<MkEmTimelineContainer v-else-if="user" :showHeader="embedParams.header">
<EmTimelineContainer v-else-if="user" :showHeader="embedParams.header">
<template #header>
<div :class="$style.userHeader">
<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"
/>
</template>
</MkEmTimelineContainer>
</EmTimelineContainer>
<XNotFound v-else/>
</div>
</template>
@ -50,7 +50,7 @@ import { ref, computed, shallowRef, inject, onActivated } from 'vue';
import * as Misskey from 'misskey-js';
import MkNotes from '@/components/MkNotes.vue';
import XNotFound from '@/pages/not-found.vue';
import MkEmTimelineContainer from '@/embed/components/MkEmTimelineContainer.vue';
import EmTimelineContainer from '@/embed/components/EmTimelineContainer.vue';
import type { Paging } from '@/components/MkPagination.vue';
import { misskeyApi } from '@/scripts/misskey-api.js';
import { i18n } from '@/i18n.js';