diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-03 13:39:22 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-03 13:39:22 -0700 |
| commit | 05d95d80a896d14474c7f7384d67b9edd524b922 (patch) | |
| tree | 2fcc619c38175014813ffc7df34abad82e5d5b77 /web/react/components/mention.jsx | |
| parent | 48ca3a4007c8b9c40a3bc3789563ed9992e9b64d (diff) | |
| parent | 4f0c06114b61c92d982baac1c54ed80da93a9cc9 (diff) | |
| download | chat-05d95d80a896d14474c7f7384d67b9edd524b922.tar.gz chat-05d95d80a896d14474c7f7384d67b9edd524b922.tar.bz2 chat-05d95d80a896d14474c7f7384d67b9edd524b922.zip | |
Merge branch 'master' into PLT-12
Diffstat (limited to 'web/react/components/mention.jsx')
| -rw-r--r-- | web/react/components/mention.jsx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/web/react/components/mention.jsx b/web/react/components/mention.jsx index 72a2a6251..3a09e843d 100644 --- a/web/react/components/mention.jsx +++ b/web/react/components/mention.jsx @@ -19,11 +19,14 @@ export default class Mention extends React.Component { if (this.props.id === 'allmention' || this.props.id === 'channelmention') { icon = <span><i className='mention-img fa fa-users fa-2x'></i></span>; } else if (this.props.id != null) { - icon = (<span><img - className='mention-img' - src={'/api/v1/users/' + this.props.id + '/image?time=' + timestamp} - /> - </span>); + icon = ( + <span> + <img + className='mention-img' + src={'/api/v1/users/' + this.props.id + '/image?time=' + timestamp} + /> + </span> + ); } else { icon = <span><i className='mention-img fa fa-users fa-2x'></i></span>; } |