diff options
| author | ThibG <thib@sitedethib.com> | 2018-12-14 20:34:18 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-12-14 20:34:18 +0100 |
| commit | 7c48688d85d0ab64501cea6b8a516867a786bb4c (patch) | |
| tree | 90d06a2095d07892bfe724da313d21dfd0994833 /app/javascript/mastodon/features/account | |
| parent | 7241db299c7299770791a8674f4d7efde0faff6d (diff) | |
Make avatar and headers respect `auto_play_gif` (#9515)
* 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
Diffstat (limited to 'app/javascript/mastodon/features/account')
| -rw-r--r-- | app/javascript/mastodon/features/account/components/header.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js index 8604e7167..2ab25cde4 100644 --- a/app/javascript/mastodon/features/account/components/header.js +++ b/app/javascript/mastodon/features/account/components/header.js @@ -158,7 +158,7 @@ class Header extends ImmutablePureComponent { const badge = account.get('bot') ? (<div className='roles'><div className='account-role bot'><FormattedMessage id='account.badges.bot' defaultMessage='Bot' /></div></div>) : null; return ( - <div className={classNames('account__header', { inactive: !!account.get('moved') })} style={{ backgroundImage: `url(${account.get('header')})` }}> + <div className={classNames('account__header', { inactive: !!account.get('moved') })} style={{ backgroundImage: `url(${autoPlayGif ? account.get('header') : account.get('header_static')})` }}> <div> <Avatar account={account} /> |