diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-03-01 08:25:00 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-03-01 08:25:00 -0500 |
commit | 39c83f70fc227e9bb88c24b15ff2b8748e9d670b (patch) | |
tree | 132e5ee00c2df59888acec96d013cb9657aae938 /web/react | |
parent | 2f53edb2fde3e1fdcd1fd73d4bd9ec99be345273 (diff) | |
parent | 5f32b5e80f54e45adbb31decb408d73a10f67efd (diff) | |
download | chat-39c83f70fc227e9bb88c24b15ff2b8748e9d670b.tar.gz chat-39c83f70fc227e9bb88c24b15ff2b8748e9d670b.tar.bz2 chat-39c83f70fc227e9bb88c24b15ff2b8748e9d670b.zip |
Merge pull request #2261 from daizenberg/PLT-867
PLT-867: Removed member cnt icon in Direct channels
Diffstat (limited to 'web/react')
-rw-r--r-- | web/react/components/channel_header.jsx | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx index 727f84e8e..51be13dcf 100644 --- a/web/react/components/channel_header.jsx +++ b/web/react/components/channel_header.jsx @@ -194,6 +194,17 @@ export default class ChannelHeader extends React.Component { ); } + let popoverListMembers; + if (!isDirect) { + popoverListMembers = ( + <PopoverListMembers + members={this.state.users} + memberCount={this.state.userCount} + channelId={channel.id} + /> + ); + } + const dropdownContents = []; if (isDirect) { dropdownContents.push( @@ -442,11 +453,7 @@ export default class ChannelHeader extends React.Component { </div> </th> <th> - <PopoverListMembers - members={this.state.users} - memberCount={this.state.userCount} - channelId={channel.id} - /> + {popoverListMembers} </th> <th className='search-bar__container'><NavbarSearchBox/></th> <th> |