mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-11-01 15:45:58 +09:00
Code

Fix bug

Browse Source 
Fix #4390
This commit is contained in:
syuilo 2019-03-02 08:13:09 +09:00
parent 1d02d9e0fe
commit 5cc940c08a
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/client/app/common/views/deck/deck.user-column.vue
View File

@ -1,7 +1,7 @@
<template>
<x-column>
<template #header>
<fa icon="user"/><mk-user-name :user="user" v-if="user"/>
<fa icon="user"/><mk-user-name :user="user" v-if="user" :key="user.id"/>
</template>
<div class="zubukjlciycdsyynicqrnlsmdwmymzqu" v-if="user">
@ -15,9 +15,9 @@
<div>
<button class="menu" @click="menu" ref="menu"><fa icon="ellipsis-h"/></button>
<mk-follow-button v-if="$store.getters.isSignedIn && user.id != $store.state.i.id" :user="user" class="follow" mini/>
<mk-avatar class="avatar" :user="user" :disable-preview="true"/>
<mk-avatar class="avatar" :user="user" :disable-preview="true" :key="user.id"/>
<router-link class="name" :to="user | userPage()">
<mk-user-name :user="user"/>
<mk-user-name :user="user" :key="user.id"/>
</router-link>
<span class="acct">@{{ user | acct }} <fa v-if="user.isLocked == true" class="locked" icon="lock" fixed-width/></span>
<span class="followed" v-if="user.isFollowed">{{ $t('follows-you') }}</span>
@ -25,7 +25,7 @@
</header>
<div class="info">
<div class="description">
<mfm v-if="user.description" :text="user.description" :is-note="false" :author="user" :i="$store.state.i" :custom-emojis="user.emojis"/>
<mfm v-if="user.description" :text="user.description" :is-note="false" :author="user" :i="$store.state.i" :custom-emojis="user.emojis" :key="user.id"/>
</div>
<div class="fields" v-if="user.fields">
<dl class="field" v-for="(field, i) in user.fields" :key="i">

2
src/client/app/desktop/views/home/note.vue
View File

@ -1,6 +1,6 @@
<template>
<div v-if="!fetching" class="kcthdwmv">
<mk-note-detail :note="note"/>
<mk-note-detail :note="note" :key="note.id"/>
<footer>
<router-link v-if="note.next" :to="note.next"><fa icon="angle-left"/> {{ $t('next') }}</router-link>
<router-link v-if="note.prev" :to="note.prev">{{ $t('prev') }} <fa icon="angle-right"/></router-link>

2
src/client/app/mobile/views/pages/note.vue
View File

@ -3,7 +3,7 @@
<template #header><span style="margin-right:4px;"><fa :icon="['far', 'sticky-note']"/></span>{{ $t('title') }}</template>
<main v-if="!fetching">
<div>
<mk-note-detail :note="note"/>
<mk-note-detail :note="note" :key="note.id"/>
</div>
<footer>
<router-link v-if="note.prev" :to="note.prev"><fa icon="angle-left"/> {{ $t('prev') }}</router-link>

6
src/client/app/mobile/views/pages/user/index.vue
View File

@ -1,7 +1,7 @@
<template>
<mk-ui>
<template #header v-if="!fetching">
<img :src="avator" alt=""><mk-user-name :user="user"/>
<img :src="avator" alt=""><mk-user-name :user="user" :key="user.id"/>
</template>
<div class="wwtwuxyh" v-if="!fetching">
<div class="is-suspended" v-if="user.isSuspended"><p><fa icon="exclamation-triangle"/> {{ $t('@.user-suspended') }}</p></div>
@ -17,12 +17,12 @@
<mk-follow-button v-if="$store.getters.isSignedIn && $store.state.i.id != user.id" :user="user"/>
</div>
<div class="title">
<h1><mk-user-name :user="user"/></h1>
<h1><mk-user-name :user="user" :key="user.id"/></h1>
<span class="username"><mk-acct :user="user" :detail="true" /></span>
<span class="followed" v-if="user.isFollowed">{{ $t('follows-you') }}</span>
</div>
<div class="description">
<mfm v-if="user.description" :text="user.description" :is-note="false" :author="user" :i="$store.state.i" :custom-emojis="user.emojis"/>
<mfm v-if="user.description" :text="user.description" :is-note="false" :author="user" :i="$store.state.i" :custom-emojis="user.emojis" :key="user.id"/>
<x-integrations :user="user" style="margin:20px 0;"/>
</div>
<div class="fields" v-if="user.fields">