diff options
author | Asaad Mahmood <Unknowngi@live.com> | 2015-10-16 23:19:23 +0500 |
---|---|---|
committer | Asaad Mahmood <Unknowngi@live.com> | 2015-10-16 23:19:23 +0500 |
commit | 7849a48a859302e9d3e3ed14f3de380705f3ba78 (patch) | |
tree | a7a4ad1b3edbe3656cc8a36753651a6899b72d75 /web/react/components/user_profile.jsx | |
parent | e840cb612f9ddf537a0d9ec7223ea87bc15b0308 (diff) | |
parent | 3bd0a15341a5cff29c172aed73cda688e63fb7e7 (diff) | |
download | chat-7849a48a859302e9d3e3ed14f3de380705f3ba78.tar.gz chat-7849a48a859302e9d3e3ed14f3de380705f3ba78.tar.bz2 chat-7849a48a859302e9d3e3ed14f3de380705f3ba78.zip |
Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements
Conflicts:
web/react/components/popover_list_members.jsx
web/react/components/user_profile.jsx
Diffstat (limited to 'web/react/components/user_profile.jsx')
-rw-r--r-- | web/react/components/user_profile.jsx | 35 |
1 files changed, 26 insertions, 9 deletions
diff --git a/web/react/components/user_profile.jsx b/web/react/components/user_profile.jsx index 47d836321..da0c1aaf9 100644 --- a/web/react/components/user_profile.jsx +++ b/web/react/components/user_profile.jsx @@ -65,19 +65,29 @@ export default class UserProfile extends React.Component { var dataContent = []; dataContent.push( - <img className='user-popover__image' + <img + className='user-popover__image' src={'/api/v1/users/' + this.state.profile.id + '/image?time=' + this.state.profile.update_at} height='128' width='128' + key='user-popover-image' /> ); if (!global.window.config.ShowEmailAddress === 'true') { - dataContent.push(<div className='text-nowrap'>{'Email not shared'}</div>); + dataContent.push( + <div + className='text-nowrap' + key='user-popover-no-email' + > + {'Email not shared'} + </div> + ); } else { dataContent.push( <div data-toggle='tooltip' title="' + this.state.profile.email + '" + key='user-popover-email' > <a href="mailto:' + this.state.profile.email + '" @@ -94,14 +104,21 @@ export default class UserProfile extends React.Component { trigger='click' placement='right' rootClose={true} - overlay={<Popover title={this.state.profile.username}>{dataContent}</Popover>} - > - <div - className='user-popover' - id={'profile_' + this.uniqueId} + overlay={ + <Popover + title={this.state.profile.username} + id='user-profile-popover' + > + {dataContent} + </Popover> + } > - {name} - </div> + <div + className='user-popover' + id={'profile_' + this.uniqueId} + > + {name} + </div> </OverlayTrigger> ); } |