diff options
author | Brendan Bowidas <brendanbowidas@gmail.com> | 2016-12-22 15:02:23 -0500 |
---|---|---|
committer | enahum <nahumhbl@gmail.com> | 2016-12-22 17:02:23 -0300 |
commit | bd67c1f227da9b964fff5d88e9e0a1eaf2897f35 (patch) | |
tree | 2228ce75c4b67ef1474176e077908256b917956c /webapp | |
parent | a793eb865151b27f10fd8ff743e229535cc63865 (diff) | |
download | chat-bd67c1f227da9b964fff5d88e9e0a1eaf2897f35.tar.gz chat-bd67c1f227da9b964fff5d88e9e0a1eaf2897f35.tar.bz2 chat-bd67c1f227da9b964fff5d88e9e0a1eaf2897f35.zip |
GH-4658 Show profile popover when clicking on username or profile picture in DMs (#4705)
* GH-4658 Show profile popover when clicking on username or profile picture at top of Direct Message channel
* enable popover on username
Diffstat (limited to 'webapp')
-rw-r--r-- | webapp/utils/channel_intro_messages.jsx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/webapp/utils/channel_intro_messages.jsx b/webapp/utils/channel_intro_messages.jsx index 36d8cdb2a..0c011734a 100644 --- a/webapp/utils/channel_intro_messages.jsx +++ b/webapp/utils/channel_intro_messages.jsx @@ -12,6 +12,7 @@ import TeamStore from 'stores/team_store.jsx'; import Constants from 'utils/constants.jsx'; import * as GlobalActions from 'actions/global_actions.jsx'; import Client from 'client/web_client.jsx'; +import ProfilePicture from 'components/profile_picture.jsx'; import React from 'react'; import {FormattedMessage, FormattedHTMLMessage, FormattedDate} from 'react-intl'; @@ -46,18 +47,18 @@ export function createDMIntroMessage(channel, centeredIntro) { return ( <div className={'channel-intro ' + centeredIntro}> <div className='post-profile-img__container channel-intro-img'> - <img - className='post-profile-img' + <ProfilePicture src={Client.getUsersRoute() + '/' + teammate.id + '/image?time=' + teammate.update_at} - height='50' width='50' + height='50' + user={teammate} /> </div> <div className='channel-intro-profile'> <strong> <UserProfile user={teammate} - disablePopover={true} + disablePopover={false} /> </strong> </div> |