summaryrefslogtreecommitdiff
path: root/src/client/app/desktop/views
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-04-18 03:14:04 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-04-18 03:14:04 +0900
commitf7b1ef0690b7e30f5918ebf518854b28c0654157 (patch)
tree874ac60db55ec7d91d9bc0b9501706be8f4330d5 /src/client/app/desktop/views
parent11.1.6 (diff)
downloadmisskey-f7b1ef0690b7e30f5918ebf518854b28c0654157.tar.gz
misskey-f7b1ef0690b7e30f5918ebf518854b28c0654157.tar.bz2
misskey-f7b1ef0690b7e30f5918ebf518854b28c0654157.zip
アンケートウィジットでもMFMを使用するように v11 (#4741)
* MFM in poll * use mfm
Diffstat (limited to 'src/client/app/desktop/views')
-rw-r--r--src/client/app/desktop/views/widgets/polls.vue4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/client/app/desktop/views/widgets/polls.vue b/src/client/app/desktop/views/widgets/polls.vue
index 3567cae5ed..c77762ecdf 100644
--- a/src/client/app/desktop/views/widgets/polls.vue
+++ b/src/client/app/desktop/views/widgets/polls.vue
@@ -11,7 +11,9 @@
<div class="mkw-polls--body">
<div class="poll" v-if="!fetching && poll != null">
- <p v-if="poll.text"><router-link :to="poll | notePage">{{ poll.text }}</router-link></p>
+ <p v-if="poll.text"><router-link :to="poll | notePage">
+ <mfm :text="poll.text" :author="poll.user" :custom-emojis="poll.emojis"/>
+ </router-link></p>
<p v-if="!poll.text"><router-link :to="poll | notePage"><fa icon="link"/></router-link></p>
<mk-poll :note="poll"/>
</div>