diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2021-09-09 21:51:39 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2021-09-09 21:51:39 +0000 |
| commit | 370f1e55adddd60a22bf56a7782ba61f239eb13c (patch) | |
| tree | 3a4c897ac420b8d6ab92b31e2779f88947016eed /src/components/poll/poll.vue | |
| parent | f35e3d0f3fc1a6bb4ebd77fba1dce0ac27f5b7d7 (diff) | |
| parent | a8a82ad12f2f7b9eb8fe7a57a3a7d503c6bbe2ed (diff) | |
Merge branch 'develop' into 'themeApply'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'src/components/poll/poll.vue')
| -rw-r--r-- | src/components/poll/poll.vue | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue index 187d1829..63b44e4f 100644 --- a/src/components/poll/poll.vue +++ b/src/components/poll/poll.vue @@ -17,8 +17,11 @@ <span class="result-percentage"> {{ percentageForOption(option.votes_count) }}% </span> - <!-- eslint-disable-next-line vue/no-v-html --> - <span v-html="option.title_html" /> + <RichContent + :html="option.title_html" + :handle-links="false" + :emoji="emoji" + /> </div> <div class="result-fill" @@ -42,8 +45,11 @@ :value="index" > <label class="option-vote"> - <!-- eslint-disable-next-line vue/no-v-html --> - <div v-html="option.title_html" /> + <RichContent + :html="option.title_html" + :handle-links="false" + :emoji="emoji" + /> </label> </div> </div> |