sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into notification-visibility-read-2

Browse Source
This commit is contained in:
tamaina
2020-05-31 21:53:56 +09:00
parent 7c38cda8ee ffc7f42efc
commit fb91ab4080
16 changed files with 105 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/components/notifications.vue
View File

@ -5,7 +5,7 @@
<x-notification v-else :notification="notification" :with-time="true" :full="true" class="_panel notification" :key="notification.id"/>
</x-list>
<button class="_panel _button" v-if="more" @click="fetchMore" :disabled="moreFetching">
<button class="_panel _button" ref="loadMore" v-show="more" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }">
<template v-if="!moreFetching">{{ $t('loadMore') }}</template>
<template v-if="moreFetching"><mk-loading inline/></template>
</button>