diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-12-15 19:49:32 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-12-15 19:49:32 +0000 |
| commit | 5077549c7314c5ba18160a2a1a0bb303f143c182 (patch) | |
| tree | 75692d4698875fa4df4ff239222ed2bb25d12b24 /src | |
| parent | 32ed09bae56a9a10e50906fc80cdd0f2357bceb3 (diff) | |
| parent | 415119cda949f2c92865f9ea5db3e377b83d1eb0 (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/poll/poll.vue | 3 | ||||
| -rw-r--r-- | src/services/entity_normalizer/entity_normalizer.service.js | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue index 264a5f03..42819c19 100644 --- a/src/components/poll/poll.vue +++ b/src/components/poll/poll.vue @@ -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> diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index e3a52489..b1e68df5 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -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 |