alex/yomichan
1
Fork 0
Code Releases Activity

fix sort order

Browse Source
This commit is contained in:
Alex Yatskov 2017-09-17 13:07:15 -07:00
parent ba25fbfd1f
commit 7c69b4f28a
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ext/bg/js/dictionary.js
View File

@ -55,14 +55,6 @@ function dictRowsSort(rows, options) {
function dictTermsSort(definitions, dictionaries=null) { function dictTermsSort(definitions, dictionaries=null) {
return definitions.sort((v1, v2) => { return definitions.sort((v1, v2) => {
const sl1 = v1.source.length;
const sl2 = v2.source.length;
if (sl1 > sl2) {
return -1;
} else if (sl1 < sl2) {
return 1;
}
if (dictionaries !== null) { if (dictionaries !== null) {
const p1 = (dictionaries[v1.dictionary] || {}).priority || 0; const p1 = (dictionaries[v1.dictionary] || {}).priority || 0;
const p2 = (dictionaries[v2.dictionary] || {}).priority || 0; const p2 = (dictionaries[v2.dictionary] || {}).priority || 0;
@ -73,11 +65,11 @@ function dictTermsSort(definitions, dictionaries=null) {
} }
} }
const s1 = v1.score; const sl1 = v1.source.length;
const s2 = v2.score; const sl2 = v2.source.length;
if (s1 > s2) { if (sl1 > sl2) {
return -1; return -1;
} else if (s1 < s2) { } else if (sl1 < sl2) {
return 1; return 1;
} }
@ -89,6 +81,14 @@ function dictTermsSort(definitions, dictionaries=null) {
return 1; return 1;
} }
const s1 = v1.score;
const s2 = v2.score;
if (s1 > s2) {
return -1;
} else if (s1 < s2) {
return 1;
}
return v2.expression.localeCompare(v1.expression); return v2.expression.localeCompare(v1.expression);
}); });
} }