summaryrefslogtreecommitdiff
path: root/src/client/components/ui
diff options
context:
space:
mode:
authortamaina <tamaina@hotmail.co.jp>2020-05-31 21:53:56 +0900
committertamaina <tamaina@hotmail.co.jp>2020-05-31 21:53:56 +0900
commitfb91ab4080ade2234d6ea21cd877d635d226b6c3 (patch)
tree0caee66bde5d6565358b190ab57f259c353445c8 /src/client/components/ui
parentRefactor (diff)
parentfix(client): 全既読系ボタンのAPIの指定が間違っているのを... (diff)
downloadmisskey-fb91ab4080ade2234d6ea21cd877d635d226b6c3.tar.gz
misskey-fb91ab4080ade2234d6ea21cd877d635d226b6c3.tar.bz2
misskey-fb91ab4080ade2234d6ea21cd877d635d226b6c3.zip
Merge branch 'develop' into notification-visibility-read-2
Diffstat (limited to 'src/client/components/ui')
-rw-r--r--src/client/components/ui/pagination.vue4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/components/ui/pagination.vue b/src/client/components/ui/pagination.vue
index e888b7420c..79d322bbc4 100644
--- a/src/client/components/ui/pagination.vue
+++ b/src/client/components/ui/pagination.vue
@@ -4,8 +4,8 @@
<div class="empty" v-if="empty" key="_empty_">
<slot name="empty"></slot>
</div>
- <div class="more" v-if="more" key="_more_">
- <mk-button class="button" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" @click="fetchMore()" primary>
+ <div class="more" v-show="more" key="_more_">
+ <mk-button class="button" ref="loadMore" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary>
<template v-if="!moreFetching">{{ $t('loadMore') }}</template>
<template v-if="moreFetching"><mk-loading inline/></template>
</mk-button>