From dfccfe78feb532381f475365763de113aa4ef7a4 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Mon, 2 Nov 2015 15:30:43 -0800
Subject: Added additional checks to channel sorting that sorts by display_name

---
 web/react/components/navbar_dropdown.jsx | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/navbar_dropdown.jsx b/web/react/components/navbar_dropdown.jsx
index f43bdffdf..937e88325 100644
--- a/web/react/components/navbar_dropdown.jsx
+++ b/web/react/components/navbar_dropdown.jsx
@@ -11,16 +11,24 @@ var AboutBuildModal = require('./about_build_modal.jsx');
 var Constants = require('../utils/constants.jsx');
 
 function getStateFromStores() {
-    let teams = [];
-    let teamsObject = UserStore.getTeams();
-    for (let teamId in teamsObject) {
+    const teams = [];
+    const teamsObject = UserStore.getTeams();
+    for (const teamId in teamsObject) {
         if (teamsObject.hasOwnProperty(teamId)) {
             teams.push(teamsObject[teamId]);
         }
     }
-    teams.sort(function sortByDisplayName(teamA, teamB) {
-        let teamADisplayName = teamA.display_name.toLowerCase();
-        let teamBDisplayName = teamB.display_name.toLowerCase();
+    teams.sort((teamA, teamB) => {
+        let teamADisplayName = '';
+        let teamBDisplayName = '';
+
+        if (teamA && teamA.display_name) {
+            teamADisplayName = teamA.display_name.toLowerCase();
+        }
+        if (teamB && teamB.display_name) {
+            teamBDisplayName = teamB.display_name.toLowerCase();
+        }
+
         if (teamADisplayName < teamBDisplayName) {
             return -1;
         } else if (teamADisplayName > teamBDisplayName) {
-- 
cgit v1.2.3-1-g7c22


From 9cc000f6e23d75e826c4468dd5c3977397e58e57 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Mon, 2 Nov 2015 16:04:14 -0800
Subject: Functionalized code

---
 web/react/components/navbar_dropdown.jsx | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/navbar_dropdown.jsx b/web/react/components/navbar_dropdown.jsx
index 937e88325..029b9c137 100644
--- a/web/react/components/navbar_dropdown.jsx
+++ b/web/react/components/navbar_dropdown.jsx
@@ -18,24 +18,8 @@ function getStateFromStores() {
             teams.push(teamsObject[teamId]);
         }
     }
-    teams.sort((teamA, teamB) => {
-        let teamADisplayName = '';
-        let teamBDisplayName = '';
 
-        if (teamA && teamA.display_name) {
-            teamADisplayName = teamA.display_name.toLowerCase();
-        }
-        if (teamB && teamB.display_name) {
-            teamBDisplayName = teamB.display_name.toLowerCase();
-        }
-
-        if (teamADisplayName < teamBDisplayName) {
-            return -1;
-        } else if (teamADisplayName > teamBDisplayName) {
-            return 1;
-        }
-        return 0;
-    });
+    teams.sort(Utils.sortByDisplayName);
     return {teams};
 }
 
-- 
cgit v1.2.3-1-g7c22