summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorDavid Meza <dmeza@users.noreply.github.com>2017-08-22 07:13:46 -0500
committerJoram Wilander <jwawilander@gmail.com>2017-08-22 08:13:46 -0400
commit1ce079d2d04442fb91485e88cbda67ebf260a9e8 (patch)
tree334bcd3061fd93705c0e62aec765b7187c43532b /webapp
parent12a9180807f6e1e53023de001eb7f1e611026a91 (diff)
downloadchat-1ce079d2d04442fb91485e88cbda67ebf260a9e8.tar.gz
chat-1ce079d2d04442fb91485e88cbda67ebf260a9e8.tar.bz2
chat-1ce079d2d04442fb91485e88cbda67ebf260a9e8.zip
Add a + next to direct message on sidebar to open 'Direct Messages' modal (#7159)
* Add a + next to direct message on sidebar to open 'Direct Messages' modal * Change + cick to display direct message modal without group message.
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/sidebar.jsx30
1 files changed, 30 insertions, 0 deletions
diff --git a/webapp/components/sidebar.jsx b/webapp/components/sidebar.jsx
index 31d6825c8..ff889fd6b 100644
--- a/webapp/components/sidebar.jsx
+++ b/webapp/components/sidebar.jsx
@@ -700,6 +700,18 @@ export default class Sidebar extends React.Component {
</Tooltip>
);
+ const createDirectMessageTooltip = (
+ <Tooltip
+ id='new-group-tooltip'
+ className='hidden-xs'
+ >
+ <FormattedMessage
+ id='sidebar.createDirectMessage'
+ defaultMessage='Create new direct message'
+ />
+ </Tooltip>
+ );
+
const above = (
<FormattedMessage
id='sidebar.unreads'
@@ -757,6 +769,23 @@ export default class Sidebar extends React.Component {
createPublicChannelIcon = null;
}
+ const createDirectMessageIcon = (
+ <OverlayTrigger
+ className='hidden-xs'
+ delayShow={500}
+ placement='top'
+ overlay={createDirectMessageTooltip}
+ >
+ <a
+ className='add-channel-btn'
+ href='#'
+ onClick={this.handleOpenMoreDirectChannelsModal}
+ >
+ {'+'}
+ </a>
+ </OverlayTrigger>
+ );
+
if (!ChannelUtils.showCreateOption(Constants.PRIVATE_CHANNEL, isTeamAdmin, isSystemAdmin)) {
createPrivateChannelIcon = null;
}
@@ -894,6 +923,7 @@ export default class Sidebar extends React.Component {
id='sidebar.direct'
defaultMessage='DIRECT MESSAGES'
/>
+ {createDirectMessageIcon}
</h4>
</li>
{directMessageItems}