tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add non-JS fallback for polls on public pages (#10155)

Browse Source
This commit is contained in:
ThibG
2019-03-04 18:03:12 +01:00
committed by Eugen Rochko
parent 4ced609497
commit 3de71887d8
4 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/stream_entries/_detailed_status.html.haml
View File

@ -23,7 +23,8 @@
.e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay)
- if status.poll
= react_component :poll, disabled: true, poll: ActiveModelSerializers::SerializableResource.new(status.poll, serializer: REST::PollSerializer, scope: current_user, scope_name: :current_user).as_json
= react_component :poll, disabled: true, poll: ActiveModelSerializers::SerializableResource.new(status.poll, serializer: REST::PollSerializer, scope: current_user, scope_name: :current_user).as_json do
= render partial: 'stream_entries/poll', locals: { poll: status.poll }
- elsif !status.media_attachments.empty?
- if status.media_attachments.first.video?
- video = status.media_attachments.first