Alamantus
/
Lexiconga
mirror of https://github.com/Alamantus/Lexiconga.git
1
0
Fork 0
Code Issues Releases Activity

Fix how custom sorting works! 

Sort alphabetically first, then by custom if specified
This commit is contained in:
Robbie Antenesse 2019-07-09 12:24:40 -06:00 committed by Robbie Antenesse
parent 4e1ee35c5b
commit 2bf0f15f67
1 changed files with 57 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/js/wordManagement.js
View File

@ -35,57 +35,65 @@ export function sortWords(render) {
const { alphabeticalOrder } = window.currentDictionary; const { alphabeticalOrder } = window.currentDictionary;
const sortBy = sortByDefinition ? 'definition' : 'name'; const sortBy = sortByDefinition ? 'definition' : 'name';
const ordering = {}; // map for efficient lookup of sortIndex
for (let i = 0; i < alphabeticalOrder.length; i++) {
ordering[alphabeticalOrder[i]] = i;
}
window.currentDictionary.words.sort((wordA, wordB) => { window.currentDictionary.words.sort((wordA, wordB) => {
if (wordA[sortBy] === wordB[sortBy]) return 0; // Sort normally first
return wordA[sortBy].localeCompare(wordB[sortBy], 'en', { sensitivity: 'base' }); // This is the smart way to do the below!
// if (removeDiacritics(wordA[sortBy]).toLowerCase() === removeDiacritics(wordB[sortBy]).toLowerCase()) return 0;
// return removeDiacritics(wordA[sortBy]).toLowerCase() > removeDiacritics(wordB[sortBy]).toLowerCase() ? 1 : -1;
});
const aLetters = wordA[sortBy].split(''); if (alphabeticalOrder.length > 0) {
const bLetters = wordB[sortBy].split(''); // If there's an alphabetical order specified, sort by that after! Any letters not in the alphabet will be unsorted, keeping them in ASCII order
const ordering = {}; // map for efficient lookup of sortIndex
for (let i = 0; i < aLetters.length; i++) { for (let i = 0; i < alphabeticalOrder.length; i++) {
const a = aLetters[i]; ordering[alphabeticalOrder[i]] = i + 1; // Add 1 to prevent 0 from resolving to false
if (ordering.hasOwnProperty(a)) { // if a is in the alphabet...
if (typeof bLetters[i] !== 'undefined') { // and if wordB has a letter at the same position...
const b = bLetters[i];
if (ordering.hasOwnProperty(b)) { // and b is in the alphabet then compare the letters
const aIndex = ordering[a];
const bIndex = ordering[b];
if (aIndex === bIndex) { // If the letters are the same, then...
// If wordA is shorter than wordB and this is wordA's last letter, then sort a first;
if (aLetters.length < bLetters.length && i == aLetters.length - 1) return -1;
continue; // Otherwise if it is the same letter, check the next letter
}
return aIndex - bIndex; // If different and both in alphabet, compare alphabetical order
}
} else {
return 1; // If b is shorter than a after looping, then sort a after
}
} else if (ordering.hasOwnProperty(bLetters[i])) {
return 1; // If a is not in the alphabet but b is, sort a after
} else {
if (typeof bLetters[i] !== 'undefined') { // and if wordB has a letter at the same position...
const b = bLetters[i];
if (removeDiacritics(a).toLowerCase() === removeDiacritics(b).toLowerCase()) {
if (aLetters.length < bLetters.length && i == aLetters.length - 1) return -1;
continue;
}
return removeDiacritics(a).toLowerCase() > removeDiacritics(b).toLowerCase() ? 1 : -1;
} else {
return 1; // If b is shorter than a after looping, then sort a after
}
}
} }
console.log('done looping, comparing normally:', wordA[sortBy], wordB[sortBy]); window.currentDictionary.words.sort((wordA, wordB) => {
// console.log(alphabeticalOrder, ordering);
// console.log('comparing:', wordA[sortBy], wordB[sortBy]);
if (wordA[sortBy] === wordB[sortBy]) return 0;
// If after looping, the alphabet is still different, just compare the words alphabetically. const aLetters = wordA[sortBy].split('');
if (removeDiacritics(wordA[sortBy]).toLowerCase() === removeDiacritics(wordB[sortBy]).toLowerCase()) return 0; const bLetters = wordB[sortBy].split('');
return removeDiacritics(wordA[sortBy]).toLowerCase() > removeDiacritics(wordB[sortBy]).toLowerCase() ? 1 : -1;
}); for (let i = 0; i < aLetters.length; i++) {
const a = aLetters[i];
const b = bLetters[i];
// console.log('comparing letters', a, b);
if (!b) {
// console.log('no b, ', wordA[sortBy], 'is longer than', wordB[sortBy]);
return 1;
}
if (!ordering[a] && !ordering[b]) {
// console.log('a and b not in dictionary:', a, b, 'continuing to the next letter');
continue;
}
if (!ordering[a]) {
// console.log('a is not in dictionary:', a, 'moving back:', wordA[sortBy]);
return 1;
}
if (!ordering[b]) {
// console.log('b is not in dictionary:', b, 'moving forward:', wordA[sortBy]);
return -1;
}
if (ordering[a] === ordering[b]) {
// console.log('letters are the same order:', a, b);
if (aLetters.length < bLetters.length && i === aLetters.length - 1) {
// console.log(a, 'is shorter than', b);
return -1;
}
// console.log(a, 'is the same as', b, 'continuing to the next letter');
continue;
}
// console.log('comparing order:', a, b, 'result:', ordering[a] - ordering[b]);
return ordering[a] - ordering[b];
}
// console.log('all of the letters were dumb, no sort');
return 0;
});
}
saveDictionary(false); saveDictionary(false);