diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-10-05 16:02:09 -0400 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-10-05 16:02:09 -0400 |
commit | e2e00d9d43c14806cd5a5c424b9879636dfd89c8 (patch) | |
tree | 607e55539a4827382bfdc331400885fdd073922c /web/react/components/channel_header.jsx | |
parent | 193732ffbf1107fd146412ce38a053354d972e25 (diff) | |
parent | 33b957ed1a8a44d4bed0f9c674d5602bad5028ea (diff) | |
download | chat-e2e00d9d43c14806cd5a5c424b9879636dfd89c8.tar.gz chat-e2e00d9d43c14806cd5a5c424b9879636dfd89c8.tar.bz2 chat-e2e00d9d43c14806cd5a5c424b9879636dfd89c8.zip |
Merge pull request #922 from mattermost/plt-360
PLT-360 Upgrade and changes to ESLint
Diffstat (limited to 'web/react/components/channel_header.jsx')
-rw-r--r-- | web/react/components/channel_header.jsx | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx index b81936b57..f15974d35 100644 --- a/web/react/components/channel_header.jsx +++ b/web/react/components/channel_header.jsx @@ -132,7 +132,26 @@ export default class ChannelHeader extends React.Component { } let dropdownContents = []; - if (!isDirect) { + if (isDirect) { + dropdownContents.push( + <li + key='edit_description_direct' + role='presentation' + > + <a + role='menuitem' + href='#' + data-toggle='modal' + data-target='#edit_channel' + data-desc={channel.description} + data-title={channel.display_name} + data-channelid={channel.id} + > + Set Channel Description... + </a> + </li> + ); + } else { dropdownContents.push( <li key='view_info' @@ -276,25 +295,6 @@ export default class ChannelHeader extends React.Component { </li> ); } - } else { - dropdownContents.push( - <li - key='edit_description_direct' - role='presentation' - > - <a - role='menuitem' - href='#' - data-toggle='modal' - data-target='#edit_channel' - data-desc={channel.description} - data-title={channel.display_name} - data-channelid={channel.id} - > - Set Channel Description... - </a> - </li> - ); } return ( |