about summary refs log tree commit diff
path: root/app/javascript/mastodon/features/compose/components/navigation_bar.js
diff options
context:
space:
mode:
authorOndřej Hruška <ondra@ondrovo.com>2017-08-07 19:44:55 +0200
committerEugen Rochko <eugen@zeonfederated.com>2017-08-07 19:44:55 +0200
commit594234740788a51fa528152343eb50dc1c6ca093 (patch)
tree07a8e94ab9405f54694117b04637b2db64ef3f52 /app/javascript/mastodon/features/compose/components/navigation_bar.js
parent22db9472253f6ffcfed254f7a406a58b53e80cfe (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/features/compose/components/navigation_bar.js')
-rw-r--r--app/javascript/mastodon/features/compose/components/navigation_bar.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/compose/components/navigation_bar.js b/app/javascript/mastodon/features/compose/components/navigation_bar.js
index cd2dd8f61..7f346854c 100644
--- a/app/javascript/mastodon/features/compose/components/navigation_bar.js
+++ b/app/javascript/mastodon/features/compose/components/navigation_bar.js
@@ -19,7 +19,7 @@ export default class NavigationBar extends ImmutablePureComponent {
       <div className='navigation-bar'>
         <Permalink href={this.props.account.get('url')} to={`/accounts/${this.props.account.get('id')}`}>
           <span style={{ display: 'none' }}>{this.props.account.get('acct')}</span>
-          <Avatar src={this.props.account.get('avatar')} animate size={40} />
+          <Avatar account={this.props.account} size={40} />
         </Permalink>
 
         <div className='navigation-bar__profile'>