autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor Avatar and AvatarOverlay to have 'account' as prop instead of src and staticSrc (#4526)

Browse Source 
* 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
This commit is contained in:
Ondřej Hruška
2017-08-07 19:44:55 +02:00
committed by Eugen Rochko
parent 22db947225
commit 5942347407
13 changed files with 82 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/components/status.js
View File

@ -228,9 +228,9 @@ export default class Status extends ImmutablePureComponent {
}
if (account === undefined || account === null) {
statusAvatar = <Avatar src={status.getIn(['account', 'avatar'])} staticSrc={status.getIn(['account', 'avatar_static'])} size={48} />;
statusAvatar = <Avatar account={status.get('account')} size={48} />;
}else{
statusAvatar = <AvatarOverlay staticSrc={status.getIn(['account', 'avatar_static'])} overlaySrc={account.get('avatar_static')} />;
statusAvatar = <AvatarOverlay account={status.get('account')} friend={account} />;
}
return (