diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2020-10-25 01:23:41 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2020-10-25 01:23:41 +0900 |
| commit | 7bd2a6ad611ffa4e4a0c96e49dec93350e0616db (patch) | |
| tree | 1a3ad6ba33e7bfd6fd884052f61805dc4d3aa365 /src/client/components/note.vue | |
| parent | regedit (diff) | |
| parent | 自前ルーティング (#6759) (diff) | |
| download | sharkey-7bd2a6ad611ffa4e4a0c96e49dec93350e0616db.tar.gz sharkey-7bd2a6ad611ffa4e4a0c96e49dec93350e0616db.tar.bz2 sharkey-7bd2a6ad611ffa4e4a0c96e49dec93350e0616db.zip | |
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src/client/components/note.vue')
| -rw-r--r-- | src/client/components/note.vue | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/client/components/note.vue b/src/client/components/note.vue index 85bdb9c6fb..8ddb01f733 100644 --- a/src/client/components/note.vue +++ b/src/client/components/note.vue @@ -18,9 +18,9 @@ <Fa :icon="faRetweet"/> <i18n-t keypath="renotedBy" tag="span"> <template #user> - <router-link class="name" :to="userPage(note.user)" v-user-preview="note.userId"> + <MkA class="name" :to="userPage(note.user)" v-user-preview="note.userId"> <MkUserName :user="note.user"/> - </router-link> + </MkA> </template> </i18n-t> <div class="info"> @@ -48,7 +48,7 @@ <div class="content" v-show="appearNote.cw == null || showContent"> <div class="text"> <span v-if="appearNote.isHidden" style="opacity: 0.5">({{ $t('private') }})</span> - <router-link class="reply" v-if="appearNote.replyId" :to="`/notes/${appearNote.replyId}`"><Fa :icon="faReply"/></router-link> + <MkA class="reply" v-if="appearNote.replyId" :to="`/notes/${appearNote.replyId}`"><Fa :icon="faReply"/></MkA> <Mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$store.state.i" :custom-emojis="appearNote.emojis"/> <a class="rp" v-if="appearNote.renote != null">RN:</a> </div> @@ -59,7 +59,7 @@ <MkUrlPreview v-for="url in urls" :url="url" :key="url" :compact="true" :detail="detail" class="url-preview"/> <div class="renote" v-if="appearNote.renote"><XNotePreview :note="appearNote.renote"/></div> </div> - <router-link v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`"><Fa :icon="faSatelliteDish"/> {{ appearNote.channel.name }}</router-link> + <MkA v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`"><Fa :icon="faSatelliteDish"/> {{ appearNote.channel.name }}</MkA> </div> <footer class="footer"> <XReactionsViewer :note="appearNote" ref="reactionsViewer"/> @@ -91,9 +91,9 @@ <div v-else class="_panel muted" @click="muted = false"> <i18n-t keypath="userSaysSomething" tag="small"> <template #name> - <router-link class="name" :to="userPage(appearNote.user)" v-user-preview="appearNote.userId"> + <MkA class="name" :to="userPage(appearNote.user)" v-user-preview="appearNote.userId"> <MkUserName :user="appearNote.user"/> - </router-link> + </MkA> </template> </i18n-t> </div> @@ -144,7 +144,7 @@ export default defineComponent({ inject: { inChannel: { default: null - } + }, }, props: { @@ -581,11 +581,6 @@ export default defineComponent({ }); menu = [{ - type: 'link', - icon: faInfoCircle, - text: this.$t('details'), - to: '/notes/' + this.appearNote.id - }, null, { icon: faCopy, text: this.$t('copyContent'), action: this.copyContent |