From 9ba968ce3354b1a8ab307ecc4cc785bdee16f914 Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Wed, 1 Feb 2017 08:57:16 +0900 Subject: Use consistent Display Name sorting code throughout the webapp #5159 (#5213) * Use consistent Display Name sorting code throughout the webapp #5159 * fixed broken sorting of teams and channels --- webapp/utils/utils.jsx | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'webapp/utils/utils.jsx') diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx index 4e8a05075..90e2ad63e 100644 --- a/webapp/utils/utils.jsx +++ b/webapp/utils/utils.jsx @@ -1093,25 +1093,15 @@ export function windowHeight() { return $(window).height(); } -// Use when sorting multiple channels or teams by their `display_name` field -export function sortByDisplayName(a, b) { - let aDisplayName = ''; - let bDisplayName = ''; +// Use when sorting multiple teams by their `display_name` field +export function sortTeamsByDisplayName(a, b) { + const locale = LocalizationStore.getLocale(); - if (a && a.display_name) { - aDisplayName = a.display_name.toLowerCase(); - } - if (b && b.display_name) { - bDisplayName = b.display_name.toLowerCase(); + if (a.display_name !== b.display_name) { + return a.display_name.localeCompare(b.display_name, locale, {numeric: true}); } - if (aDisplayName < bDisplayName) { - return -1; - } - if (aDisplayName > bDisplayName) { - return 1; - } - return 0; + return a.name.localeCompare(b.name, locale, {numeric: true}); } export function getChannelTerm(channelType) { -- cgit v1.2.3-1-g7c22