Make avatar and headers respect auto_play_gif
#9515
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Gargron
requested changes
Dec 14, 2018
app/views/accounts/_header.html.haml
Outdated
| @@ -1,6 +1,9 @@ | |||
| .public-account-header{:class => ("inactive" if account.moved?)} | |||
| .public-account-header__image | |||
| = image_tag account.header.url, class: 'parallax' | |||
| - if current_account&.user&.setting_auto_play_gif | |||
There was a problem hiding this comment.
Why using blocks here if you just need to switch the URL. Ternary operator should do
There was a problem hiding this comment.
For consistency with the code for avatars that is just a few lines below:
https://github.com/tootsuite/mastodon/pull/9515/files#diff-282ac2735bdc933e88272b729a2faf8bL6
There was a problem hiding this comment.
OK but that code is bad too. I think ideally it would be extracted to a helper method altogether.
Gargron
approved these changes
Dec 14, 2018
hiyuki2578
pushed a commit
to ProjectMyosotis/mastodon
that referenced
this pull request
Oct 2, 2019
* Do not animate account header art if user's GIF autoplay setting is off Fixes mastodon#9472 * Honour currently logged-in user's GIF autoplay setting for account avatars Fixes mastodon#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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also fix avatar URLs in some public pages when data is stored on a different host