format channel_store to more closely match style guide and sort channels in channel store over sidebar

web/react/components/sidebar.jsx

@@ -113,22 +113,9 @@ function getStateFromStores() {
         });
     }
 
-    var channels = ChannelStore.getAll();
-    if (channels) {
-        channels.sort(function chanSort(a, b) {
-            if (a.display_name.toLowerCase() < b.display_name.toLowerCase()) {
-                return -1;
-            }
-            if (a.display_name.toLowerCase() > b.display_name.toLowerCase()) {
-                return 1;
-            }
-            return 0;
-        });
-    }
-
     return {
         activeId: currentId,
-        channels: channels,
+        channels: ChannelStore.getAll(),
         members: members,
         showDirectChannels: showDirectChannels,
         hideDirectChannels: readDirectChannels

web/react/stores/channel_store.jsx

@@ -10,13 +10,12 @@ var ActionTypes = Constants.ActionTypes;
 
 var BrowserStore = require('../stores/browser_store.jsx');
 
-
 var CHANGE_EVENT = 'change';
 var MORE_CHANGE_EVENT = 'change';
 var EXTRA_INFO_EVENT = 'extra_info';
 
 var ChannelStore = assign({}, EventEmitter.prototype, {
-    _current_id: null,
+    _currentId: null,
     emitChange: function() {
         this.emit(CHANGE_EVENT);
     },
@@ -47,7 +46,7 @@ var ChannelStore = assign({}, EventEmitter.prototype, {
     findFirstBy: function(field, value) {
         var channels = this._getChannels();
         for (var i = 0; i < channels.length; i++) {
-      if (channels[i][field] == value) {
+            if (channels[i][field] === value) {
                 return channels[i];
             }
         }
@@ -73,21 +72,22 @@ var ChannelStore = assign({}, EventEmitter.prototype, {
         return this._getMoreChannels();
     },
     setCurrentId: function(id) {
-      this._current_id = id;
+        this._currentId = id;
     },
     setLastVisitedName: function(name) {
-    if (name == null)
-      BrowserStore.removeItem("last_visited_name");
-    else
-      BrowserStore.setItem("last_visited_name", name);
+        if (name == null) {
+            BrowserStore.removeItem('last_visited_name');
+        } else {
+            BrowserStore.setItem('last_visited_name', name);
+        }
     },
     getLastVisitedName: function() {
-    return BrowserStore.getItem("last_visited_name");
+        return BrowserStore.getItem('last_visited_name');
     },
     resetCounts: function(id) {
         var cm = this._getChannelMembers();
         for (var cmid in cm) {
-          if (cm[cmid].channel_id == id) {
+            if (cm[cmid].channel_id === id) {
                 var c = this.get(id);
                 if (c) {
                     cm[cmid].msg_count = this.get(id).total_msg_count;
@@ -99,23 +99,25 @@ var ChannelStore = assign({}, EventEmitter.prototype, {
         this._storeChannelMembers(cm);
     },
     getCurrentId: function() {
-      return this._current_id;
+        return this._currentId;
     },
     getCurrent: function() {
         var currentId = this.getCurrentId();
 
-    if (currentId)
+        if (currentId) {
             return this.get(currentId);
-    else
+        } else {
             return null;
+        }
     },
     getCurrentMember: function() {
         var currentId = ChannelStore.getCurrentId();
 
-    if (currentId)
+        if (currentId) {
             return this.getAllMembers()[currentId];
-    else
+        } else {
             return null;
+        }
     },
     setChannelMember: function(member) {
         var members = this._getChannelMembers();
@@ -127,22 +129,26 @@ var ChannelStore = assign({}, EventEmitter.prototype, {
         var currentId = ChannelStore.getCurrentId();
         var extra = null;
 
-    if (currentId)
+        if (currentId) {
             extra = this._getExtraInfos()[currentId];
+        }
 
-    if (extra == null)
+        if (extra == null) {
             extra = {members: []};
+        }
 
         return extra;
     },
-  getExtraInfo: function(channel_id) {
+    getExtraInfo: function(channelId) {
         var extra = null;
 
-    if (channel_id)
-      extra = this._getExtraInfos()[channel_id];
+        if (channelId) {
+            extra = this._getExtraInfos()[channelId];
+        }
 
-    if (extra == null)
+        if (extra == null) {
             extra = {members: []};
+        }
 
         return extra;
     },
@@ -151,7 +157,7 @@ var ChannelStore = assign({}, EventEmitter.prototype, {
         var found;
 
         for (var i = 0; i < channels.length; i++) {
-      if (channels[i].id == channel.id) {
+            if (channels[i].id === channel.id) {
                 channels[i] = channel;
                 found = true;
                 break;
@@ -160,19 +166,25 @@ var ChannelStore = assign({}, EventEmitter.prototype, {
 
         if (!found) {
             channels.push(channel);
-        channels.sort(function(a,b) {
-          if (a.display_name < b.display_name) return -1;
-          if (a.display_name > b.display_name) return 1;
+        }
+
+        channels.sort(function chanSort(a, b) {
+            if (a.display_name.toLowerCase() < b.display_name.toLowerCase()) {
+                return -1;
+            }
+            if (a.display_name.toLowerCase() > b.display_name.toLowerCase()) {
+                return 1;
+            }
             return 0;
         });
-    }
+
         this._storeChannels(channels);
     },
     _storeChannels: function(channels) {
-    BrowserStore.setItem("channels", channels);
+        BrowserStore.setItem('channels', channels);
     },
     _getChannels: function() {
-    return BrowserStore.getItem("channels", []);
+        return BrowserStore.getItem('channels', []);
     },
     _storeChannelMember: function(channelMember) {
         var members = this._getChannelMembers();
@@ -180,16 +192,16 @@ var ChannelStore = assign({}, EventEmitter.prototype, {
         this._storeChannelMembers(members);
     },
     _storeChannelMembers: function(channelMembers) {
-    BrowserStore.setItem("channel_members", channelMembers);
+        BrowserStore.setItem('channel_members', channelMembers);
     },
     _getChannelMembers: function() {
-    return BrowserStore.getItem("channel_members", {});
+        return BrowserStore.getItem('channel_members', {});
     },
     _storeMoreChannels: function(channels) {
-    BrowserStore.setItem("more_channels", channels);
+        BrowserStore.setItem('more_channels', channels);
     },
     _getMoreChannels: function() {
-    var channels = BrowserStore.getItem("more_channels");
+        var channels = BrowserStore.getItem('more_channels');
 
         if (channels == null) {
             channels = {};
@@ -199,18 +211,19 @@ var ChannelStore = assign({}, EventEmitter.prototype, {
         return channels;
     },
     _storeExtraInfos: function(extraInfos) {
-    BrowserStore.setItem("extra_infos", extraInfos);
+        BrowserStore.setItem('extra_infos', extraInfos);
     },
     _getExtraInfos: function() {
-    return BrowserStore.getItem("extra_infos", {});
+        return BrowserStore.getItem('extra_infos', {});
     },
     isDefault: function(channel) {
-    return channel.name == Constants.DEFAULT_CHANNEL;
+        return channel.name === Constants.DEFAULT_CHANNEL;
     }
 });
 
 ChannelStore.dispatchToken = AppDispatcher.register(function(payload) {
     var action = payload.action;
+    var currentId;
 
     switch(action.type) {
 
@@ -224,16 +237,20 @@ ChannelStore.dispatchToken = AppDispatcher.register(function(payload) {
         case ActionTypes.RECIEVED_CHANNELS:
             ChannelStore._storeChannels(action.channels);
             ChannelStore._storeChannelMembers(action.members);
-      var currentId = ChannelStore.getCurrentId();
-      if (currentId) ChannelStore.resetCounts(currentId);
+            currentId = ChannelStore.getCurrentId();
+            if (currentId) {
+                ChannelStore.resetCounts(currentId);
+            }
             ChannelStore.emitChange();
             break;
 
         case ActionTypes.RECIEVED_CHANNEL:
             ChannelStore._storeChannel(action.channel);
             ChannelStore._storeChannelMember(action.member);
-      var currentId = ChannelStore.getCurrentId();
-      if (currentId) ChannelStore.resetCounts(currentId);
+            currentId = ChannelStore.getCurrentId();
+            if (currentId) {
+                ChannelStore.resetCounts(currentId);
+            }
             ChannelStore.emitChange();
             break;
 
@@ -243,9 +260,9 @@ ChannelStore.dispatchToken = AppDispatcher.register(function(payload) {
             break;
 
         case ActionTypes.RECIEVED_CHANNEL_EXTRA_INFO:
-      var extra_infos = ChannelStore._getExtraInfos();
-      extra_infos[action.extra_info.id] = action.extra_info;
-      ChannelStore._storeExtraInfos(extra_infos);
+            var extraInfos = ChannelStore._getExtraInfos();
+            extraInfos[action.extra_info.id] = action.extra_info;
+            ChannelStore._storeExtraInfos(extraInfos);
             ChannelStore.emitExtraInfoChange();
             break;