Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Make avatar and headers respect auto_play_gif (#9515)

Browse source 
* Do not animate account header art if user's GIF autoplay setting is off

Fixes #9472

* Honour currently logged-in user's GIF autoplay setting for account avatars

Fixes #9467

* Fix avatar display on some public pages when data is stored on a different host

* Use ternary operator instead of if/else for avatar/header URL
This commit is contained in:
ThibG 2018-12-14 20:34:18 +01:00 • committed by Eugen Rochko
parent 7241db299c
commit 7c48688d85
3 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/home_helper.rb
View file

@ -23,7 +23,7 @@ module HomeHelper
else
link_to(path || TagManager.instance.url_for(account), class: 'account__display-name') do
content_tag(:div, class: 'account__avatar-wrapper') do
content_tag(:div, '', class: 'account__avatar', style: "width: #{size}px; height: #{size}px; background-size: #{size}px #{size}px; background-image: url(#{account.avatar.url})")
content_tag(:div, '', class: 'account__avatar', style: "width: #{size}px; height: #{size}px; background-size: #{size}px #{size}px; background-image: url(#{full_asset_url(current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url)})")
end +
content_tag(:span, class: 'display-name') do
content_tag(:bdi) do