diff options
author | Ondřej Hruška <ondra@ondrovo.com> | 2017-08-06 20:59:53 +0200 |
---|---|---|
committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-08-06 21:23:59 +0200 |
commit | 7de0fa698dcdb6bd237b260fd42b1ce9bfc7191e (patch) | |
tree | 0c4be77e50f855a8c911e8448959e0bec6e72978 | |
parent | 811d895f7bb38fb3b75a52c54bc3365601da1590 (diff) |
Updated glitch files to use the new Avatar class correctly
-rw-r--r-- | app/javascript/glitch/components/account/header.js | 6 | ||||
-rw-r--r-- | app/javascript/glitch/components/status/header.js | 11 |
2 files changed, 3 insertions, 14 deletions
diff --git a/app/javascript/glitch/components/account/header.js b/app/javascript/glitch/components/account/header.js index b79140c02..a1197c4be 100644 --- a/app/javascript/glitch/components/account/header.js +++ b/app/javascript/glitch/components/account/header.js @@ -194,11 +194,7 @@ Here, we render our component using all the things we've defined above. <div> <a href={account.get('url')} target='_blank' rel='noopener'> <span className='account__header__avatar'> - <Avatar - src={account.get('avatar')} - staticSrc={account.get('avatar_static')} - size={90} - /> + <Avatar account={account} size={90} /> </span> <span className='account__header__display-name' diff --git a/app/javascript/glitch/components/status/header.js b/app/javascript/glitch/components/status/header.js index 5ce59fba4..bdb868e4d 100644 --- a/app/javascript/glitch/components/status/header.js +++ b/app/javascript/glitch/components/status/header.js @@ -216,16 +216,9 @@ if we have a `friend` and a normal `<Avatar>` if we don't. > <div className='status__avatar'>{ friend ? ( - <AvatarOverlay - staticSrc={account.get('avatar_static')} - overlaySrc={friend.get('avatar_static')} - /> + <AvatarOverlay account={account} friend={friend} /> ) : ( - <Avatar - src={account.get('avatar')} - staticSrc={account.get('avatar_static')} - size={48} - /> + <Avatar account={account} size={48} /> ) }</div> <DisplayName account={account} /> |