diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2019-01-23 04:49:16 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-01-23 04:49:16 +0900 |
| commit | fa124abbe26abca49bd33f4eec49e691c5d029f9 (patch) | |
| tree | 19a317ed96a8c4c5ee535508a4295ef6456fb967 /src/client/app | |
| parent | Fix types (diff) | |
| download | sharkey-fa124abbe26abca49bd33f4eec49e691c5d029f9.tar.gz sharkey-fa124abbe26abca49bd33f4eec49e691c5d029f9.tar.bz2 sharkey-fa124abbe26abca49bd33f4eec49e691c5d029f9.zip | |
Supports Twemoji / CustomEmoji in poll (#3960)
* Supports Twemoji / CustomEmoji in poll
* extract emojis in polls
Diffstat (limited to 'src/client/app')
| -rw-r--r-- | src/client/app/common/views/components/poll.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/app/common/views/components/poll.vue b/src/client/app/common/views/components/poll.vue index 8817d88cc5..6a9bc786d6 100644 --- a/src/client/app/common/views/components/poll.vue +++ b/src/client/app/common/views/components/poll.vue @@ -5,7 +5,7 @@ <div class="backdrop" :style="{ 'width': (showResult ? (choice.votes / total * 100) : 0) + '%' }"></div> <span> <template v-if="choice.isVoted"><fa icon="check"/></template> - <span>{{ choice.text }}</span> + <mfm :text="choice.text" :should-break="false" :plain-text="true" :custom-emojis="note.emojis"/> <span class="votes" v-if="showResult">({{ $t('vote-count').replace('{}', choice.votes) }})</span> </span> </li> |