forked from AkkomaGang/akkoma-fe
Merge branch 'fix/no-emoji-in-poll-when-voting' into 'develop'
fix #1026 use title html for poll options before vote Closes #1026 See merge request pleroma/pleroma-fe!1307
This commit is contained in:
commit
5077549c73
3 changed files with 4 additions and 2 deletions
|
@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
|||
- Fixed pinned statuses not appearing in user profiles
|
||||
- Fixed some elements not being keyboard navigation friendly
|
||||
- Fixed your latest chat messages disappearing when closing chat view and opening it again during the same session
|
||||
- Fixed custom emoji not showing in poll options before voting
|
||||
|
||||
### Changed
|
||||
- Errors when fetching are now shown with popup errors instead of "Error fetching updates" in panel headers
|
||||
|
|
|
@ -42,7 +42,8 @@
|
|||
:value="index"
|
||||
>
|
||||
<label class="option-vote">
|
||||
<div>{{ option.title }}</div>
|
||||
<!-- eslint-disable-next-line vue/no-v-html -->
|
||||
<div v-html="option.title_html" />
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -280,7 +280,7 @@ export const parseStatus = (data) => {
|
|||
if (output.poll) {
|
||||
output.poll.options = (output.poll.options || []).map(field => ({
|
||||
...field,
|
||||
title_html: addEmojis(field.title, data.emojis)
|
||||
title_html: addEmojis(escape(field.title), data.emojis)
|
||||
}))
|
||||
}
|
||||
output.pinned = data.pinned
|
||||
|
|
Loading…
Reference in a new issue