Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

This commit is contained in:
syuilo 2022-07-19 01:20:38 +09:00
commit a8867a8eea
3 changed files with 3 additions and 3 deletions

View File

@ -6,7 +6,7 @@
<div v-if="user"> <div v-if="user">
<XFollowList :user="user" type="followers"/> <XFollowList :user="user" type="followers"/>
</div> </div>
<MkError v-else-if="error" @retry="fetch()"/> <MkError v-else-if="error" @retry="fetchUser()"/>
<MkLoading v-else/> <MkLoading v-else/>
</transition> </transition>
</MkSpacer> </MkSpacer>

View File

@ -6,7 +6,7 @@
<div v-if="user"> <div v-if="user">
<XFollowList :user="user" type="following"/> <XFollowList :user="user" type="following"/>
</div> </div>
<MkError v-else-if="error" @retry="fetch()"/> <MkError v-else-if="error" @retry="fetchUser()"/>
<MkLoading v-else/> <MkLoading v-else/>
</transition> </transition>
</MkSpacer> </MkSpacer>

View File

@ -10,7 +10,7 @@
<XPages v-else-if="tab === 'pages'" :user="user"/> <XPages v-else-if="tab === 'pages'" :user="user"/>
<XGallery v-else-if="tab === 'gallery'" :user="user"/> <XGallery v-else-if="tab === 'gallery'" :user="user"/>
</div> </div>
<MkError v-else-if="error" @retry="fetch()"/> <MkError v-else-if="error" @retry="fetchUser()"/>
<MkLoading v-else/> <MkLoading v-else/>
</transition> </transition>
</div> </div>