summaryrefslogtreecommitdiff
path: root/packages/frontend/src/components
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-02-12 10:21:20 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-02-12 10:21:20 +0900
commita8feed1effd83d4940a84093de95d0aaa88f1c6c (patch)
tree037d4df6e1b27288e33e96983200ab9f68f4da28 /packages/frontend/src/components
parentenhance(client): improve api error handling (diff)
parentenhance(server): videoThumbnailGenerator config (#9845) (diff)
downloadmisskey-a8feed1effd83d4940a84093de95d0aaa88f1c6c.tar.gz
misskey-a8feed1effd83d4940a84093de95d0aaa88f1c6c.tar.bz2
misskey-a8feed1effd83d4940a84093de95d0aaa88f1c6c.zip
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to 'packages/frontend/src/components')
-rw-r--r--packages/frontend/src/components/MkPagination.vue2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 04c8616c9a..224a42cdc2 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -21,7 +21,7 @@
<div v-else ref="rootEl">
<div v-show="pagination.reversed && more" key="_more_" class="_margin">
- <MkButton v-if="!moreFetching" v-appear="(enableInfiniteScroll && !props.disableAutoLoad) ? fetchMore : null" :class="$style.more" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary @click="fetchMore">
+ <MkButton v-if="!moreFetching" v-appear="(enableInfiniteScroll && !props.disableAutoLoad) ? fetchMoreAhead : null" :class="$style.more" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary @click="fetchMoreAhead">
{{ i18n.ts.loadMore }}
</MkButton>
<MkLoading v-else class="loading"/>