IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added additional checks to channel sorting that sorts by display_name

Browse Source
This commit is contained in:
Reed Garmsen
2015-11-02 15:30:43 -08:00
parent 3128920be9
commit dfccfe78fe
2 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
web/react/components/navbar_dropdown.jsx
View File

@@ -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) {

16
web/react/stores/channel_store.jsx
View File

@@ -183,11 +183,21 @@ class ChannelStoreClass extends EventEmitter {
channels.push(channel);
}
channels.sort(function chanSort(a, b) {
if (a.display_name.toLowerCase() < b.display_name.toLowerCase()) {
channels.sort((a, b) => {
let channelADisplayName = '';
let channelBDisplayName = '';
if (a && a.display_name) {
channelADisplayName = a.display_name.toLowerCase();
}
if (b && b.display_name) {
channelBDisplayName = b.display_name.toLowerCase();
}
if (channelADisplayName < channelBDisplayName) {
return -1;
}
if (a.display_name.toLowerCase() > b.display_name.toLowerCase()) {
if (channelADisplayName > channelBDisplayName) {
return 1;
}
return 0;