From 33b957ed1a8a44d4bed0f9c674d5602bad5028ea Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Mon, 5 Oct 2015 09:58:42 -0400
Subject: Disabling complexity warning. Allowing non-nested ternary. Upgrading
 ESList. Adding new ESLint rules. Fixing new ESLint errors.

---
 web/react/components/channel_header.jsx | 40 ++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'web/react/components/channel_header.jsx')

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 (
-- 
cgit v1.2.3-1-g7c22