diff options
| author | Ondřej Hruška <ondra@ondrovo.com> | 2017-08-07 19:44:55 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-08-07 19:44:55 +0200 |
| commit | 594234740788a51fa528152343eb50dc1c6ca093 (patch) | |
| tree | 07a8e94ab9405f54694117b04637b2db64ef3f52 /app/javascript/mastodon/components/account.js | |
| parent | 22db9472253f6ffcfed254f7a406a58b53e80cfe (diff) | |
Refactor Avatar and AvatarOverlay to have 'account' as prop instead of src and staticSrc (#4526)
* Refactored Avatar and AvatarOverlay (DRY) to have 'account' as prop. Also removed animate attribute from compose navigation bar, which should have never been there. Added test for avatar overlay. * fix broken tests * god dammit another bug in tests! travis please let this pass * formatting in avatar overlay
Diffstat (limited to 'app/javascript/mastodon/components/account.js')
| -rw-r--r-- | app/javascript/mastodon/components/account.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/components/account.js b/app/javascript/mastodon/components/account.js index b6ca0661f..69cc63d10 100644 --- a/app/javascript/mastodon/components/account.js +++ b/app/javascript/mastodon/components/account.js @@ -70,7 +70,7 @@ export default class Account extends ImmutablePureComponent { <div className='account'> <div className='account__wrapper'> <Permalink key={account.get('id')} className='account__display-name' href={account.get('url')} to={`/accounts/${account.get('id')}`}> - <div className='account__avatar-wrapper'><Avatar src={account.get('avatar')} staticSrc={account.get('avatar_static')} size={36} /></div> + <div className='account__avatar-wrapper'><Avatar account={account} size={36} /></div> <DisplayName account={account} /> </Permalink> |