diff options
| author | Reverite <github@reverite.sh> | 2019-03-30 23:42:55 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-03-30 23:42:55 -0700 |
| commit | 4d77314005483e53e320a82c87805c6bcca1c463 (patch) | |
| tree | 99f5b05bcbb1e8278517bf9a8f9ab114ab2dec45 /app/views/stream_entries/_detailed_status.html.haml | |
| parent | e356a902d23a0ed87c62717085a37d34550c8464 (diff) | |
| parent | 925830d11bb5c132e282f82bdb2ca893d87c9c24 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/views/stream_entries/_detailed_status.html.haml')
| -rw-r--r-- | app/views/stream_entries/_detailed_status.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml index d18ecd37a..4459581d9 100644 --- a/app/views/stream_entries/_detailed_status.html.haml +++ b/app/views/stream_entries/_detailed_status.html.haml @@ -22,9 +22,9 @@ %a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more') .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 do - = render partial: 'stream_entries/poll', locals: { status: status, poll: status.poll, autoplay: autoplay } + - if status.preloadable_poll + = react_component :poll, disabled: true, poll: ActiveModelSerializers::SerializableResource.new(status.preloadable_poll, serializer: REST::PollSerializer, scope: current_user, scope_name: :current_user).as_json do + = render partial: 'stream_entries/poll', locals: { status: status, poll: status.preloadable_poll, autoplay: autoplay } - elsif !status.media_attachments.empty? - if status.media_attachments.first.video? - video = status.media_attachments.first |