From 1692fca1c3eb2569620813caa59b6a4b82f1872a Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Tue, 11 Aug 2015 11:18:15 -0400
Subject: update rename channel modal to not refresh page on channel name
 change

---
 web/react/components/sidebar.jsx | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

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

diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index f6ac36f50..f4992d4e3 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -102,7 +102,20 @@ function getStateFromStores() {
         }
         readDirectChannels = readDirectChannels.slice(index);
 
-        showDirectChannels.sort(function(a, b) {
+        showDirectChannels.sort(function directSort(a, b) {
+            if (a.display_name < b.display_name) {
+                return -1;
+            }
+            if (a.display_name > b.display_name) {
+                return 1;
+            }
+            return 0;
+        });
+    }
+
+    var channels = ChannelStore.getAll();
+    if (channels) {
+        channels.sort(function chanSort(a, b) {
             if (a.display_name < b.display_name) {
                 return -1;
             }
@@ -114,8 +127,8 @@ function getStateFromStores() {
     }
 
     return {
-        active_id: currentId,
-        channels: ChannelStore.getAll(),
+        activeId: currentId,
+        channels: channels,
         members: members,
         showDirectChannels: showDirectChannels,
         hideDirectChannels: readDirectChannels
-- 
cgit v1.2.3-1-g7c22