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/more_direct_channels.jsx | 32 +++++++++++++--------------
 1 file changed, 16 insertions(+), 16 deletions(-)

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

diff --git a/web/react/components/more_direct_channels.jsx b/web/react/components/more_direct_channels.jsx
index 54d77c358..c71abd43a 100644
--- a/web/react/components/more_direct_channels.jsx
+++ b/web/react/components/more_direct_channels.jsx
@@ -31,22 +31,7 @@ export default class MoreDirectChannels extends React.Component {
             var active = '';
             var handleClick = null;
 
-            if (!channel.fake) {
-                if (channel.id === ChannelStore.getCurrentId()) {
-                    active = 'active';
-                }
-
-                if (channel.unread) {
-                    badge = <span className='badge pull-right small'>{channel.unread}</span>;
-                    titleClass = 'unread-title';
-                }
-
-                handleClick = function clickHandler(e) {
-                    e.preventDefault();
-                    utils.switchChannel(channel);
-                    $(React.findDOMNode(self.refs.modal)).modal('hide');
-                };
-            } else {
+            if (channel.fake) {
                 // It's a direct message channel that doesn't exist yet so let's create it now
                 var otherUserId = utils.getUserIdFromChannelName(channel);
 
@@ -78,6 +63,21 @@ export default class MoreDirectChannels extends React.Component {
                         );
                     };
                 }
+            } else {
+                if (channel.id === ChannelStore.getCurrentId()) {
+                    active = 'active';
+                }
+
+                if (channel.unread) {
+                    badge = <span className='badge pull-right small'>{channel.unread}</span>;
+                    titleClass = 'unread-title';
+                }
+
+                handleClick = function clickHandler(e) {
+                    e.preventDefault();
+                    utils.switchChannel(channel);
+                    $(React.findDOMNode(self.refs.modal)).modal('hide');
+                };
             }
 
             return (
-- 
cgit v1.2.3-1-g7c22

