Merge pull request #32 from evt-project/fix/list-indexes-order

Fix sorting of items in list starting with ç. Fix #27
evt-project · Nov 10, 2020 · 2766689 · 2766689
2 parents 38713fd + 032197e
commit 2766689
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/js/main/interface_control/ic_init.js b/js/main/interface_control/ic_init.js
@@ -487,9 +487,6 @@ function handleListOutput(listType, listDefaultLabel, listEl, htmlEl) {
                 var orderListLetter = this.getAttribute('data-order-list')
                 if (orderListLetter) {
                     orderListLetter = orderListLetter.toUpperCase();
-                    if (orderListLetter === 'Ç') {
-                        orderListLetter = "C";
-                    }
                     if (!LISTS_MODEL[listName][orderListLetter]) {
                         LISTS_MODEL[listName][orderListLetter] = [];
                         LISTS_MODEL[listName]._filterIndexes.push(orderListLetter);

diff --git a/js/main/interface_control/ic_lists.js b/js/main/interface_control/ic_lists.js
@@ -210,6 +210,8 @@ function updateKeysVisibility(listName) {
 	listLetters.innerHTML = '';
 	if (LISTS_MODEL[listName]._items && Object.keys(LISTS_MODEL[listName]._items).length >= 30) {
 		var orderedIndexes = LISTS_MODEL[listName]._filterIndexes.sort(function (a, b) {
+			a = a === 'Ç' ? 'C' : a;
+			b = b === 'Ç' ? 'C' : b;
 			if (a < b) return -1;
 			if (a > b) return 1;
 			return 0;