moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Polls: Construct an html field during normalization.

This commit is contained in:
lain 2020-06-14 13:16:08 +02:00
parent 7de56a8063
commit d41c9a717c
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/poll/poll.vue
View File

@ -17,7 +17,7 @@
<span class="result-percentage"> <span class="result-percentage">
{{ percentageForOption(option.votes_count) }}% {{ percentageForOption(option.votes_count) }}%
</span> </span>
<span>{{ option.title }}</span> <span v-html="option.title_html"></span>
</div> </div>
<div <div
class="result-fill" class="result-fill"
@ -75,6 +75,12 @@
@import '../../_variables.scss'; @import '../../_variables.scss';
.poll { .poll {
img.emoji {
vertical-align: middle;
object-fit: contain;
width: 32px;
height: 32px;
}
.votes { .votes {
display: flex; display: flex;
flex-direction: column; flex-direction: column;

6
src/services/entity_normalizer/entity_normalizer.service.js
View File

@ -258,6 +258,12 @@ export const parseStatus = (data) => {
output.summary_html = addEmojis(escape(data.spoiler_text), data.emojis) output.summary_html = addEmojis(escape(data.spoiler_text), data.emojis)
output.external_url = data.url output.external_url = data.url
output.poll = data.poll output.poll = data.poll
if (output.poll) {
output.poll.options = (output.poll.options || []).map(field => {
field.title_html = addEmojis(field.title, data.emojis)
return field
})
}
output.pinned = data.pinned output.pinned = data.pinned
output.muted = data.muted output.muted = data.muted
} else { } else {