diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-20 17:29:12 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-20 17:29:12 +0100 |
| commit | 80f0910e2141b24082b9143266a9a6cf1ef6a516 (patch) | |
| tree | af7a96def3f54cdb4b8fcb11adc1ecb36166c529 /app/views/stream_entries/_poll.html.haml | |
| parent | 66d945209278c9344d503fe4e7a58d5c6f040e50 (diff) | |
Add support for custom emojis in poll options (#10322)
* Backend changes for custom emoji support in poll options * Serialize poll emojis in REST API * Render custom emojis in poll options * Render custom emoji in poll options on public pages
Diffstat (limited to 'app/views/stream_entries/_poll.html.haml')
| -rw-r--r-- | app/views/stream_entries/_poll.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/stream_entries/_poll.html.haml b/app/views/stream_entries/_poll.html.haml index d6b2c0cd9..ba34890df 100644 --- a/app/views/stream_entries/_poll.html.haml +++ b/app/views/stream_entries/_poll.html.haml @@ -10,11 +10,11 @@ %label.poll__text>< %span.poll__number= percent.round - = option.title + = Formatter.instance.format_poll_option(status, option, autoplay: autoplay) - else %label.poll__text>< %span.poll__input{ class: poll.multiple? ? 'checkbox' : nil}>< - = option.title + = Formatter.instance.format_poll_option(status, option, autoplay: autoplay) .poll__footer - unless show_results %button.button.button-secondary{ disabled: true } |