diff options
| author | Renato "Lond" Cerqueira <renato@lond.com.br> | 2018-08-31 15:16:59 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-08-31 15:16:59 +0200 |
| commit | fe56d26f7b5bf6718bb5b8c28a7daaa45fd302ee (patch) | |
| tree | 1863f6bfa5951b31ac0fc0f85c8287bb8df6b887 /app/views/stream_entries | |
| parent | 50d8cf8aedd85551335e1d4e896209e28545910f (diff) | |
Fix autoplay issue with spoiler tag (#8540)
Add tests to avoid similar issues in the future
Diffstat (limited to 'app/views/stream_entries')
| -rw-r--r-- | app/views/stream_entries/_detailed_status.html.haml | 2 | ||||
| -rw-r--r-- | app/views/stream_entries/_simple_status.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml index 6251cdd1a..bf5f614a1 100644 --- a/app/views/stream_entries/_detailed_status.html.haml +++ b/app/views/stream_entries/_detailed_status.html.haml @@ -17,7 +17,7 @@ .status__content.emojify< - if status.spoiler_text? %p{ style: 'margin-bottom: 0' }< - %span.p-summary> #{Formatter.instance.format_spoiler(status)} + %span.p-summary> #{Formatter.instance.format_spoiler(status, autoplay: autoplay)} %a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more') .e-content{ lang: status.language, style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay) diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml index 1d596d4e0..e147596f6 100644 --- a/app/views/stream_entries/_simple_status.html.haml +++ b/app/views/stream_entries/_simple_status.html.haml @@ -20,7 +20,7 @@ .status__content.emojify< - if status.spoiler_text? %p{ style: 'margin-bottom: 0' }< - %span.p-summary> #{Formatter.instance.format_spoiler(status)} + %span.p-summary> #{Formatter.instance.format_spoiler(status, autoplay: autoplay)} %a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more') .e-content{ lang: status.language, style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay) |