Fix accounts sorting - Fixes #347

This commit is contained in:
Bubka 2024-09-09 15:20:09 +02:00
parent 7c3198523c
commit d90ffd504a

View File

@ -184,14 +184,12 @@ export const useTwofaccounts = defineStore({
sortAsc() { sortAsc() {
this.items.sort(function(a, b) { this.items.sort(function(a, b) {
if (useUserStore().preferences.sortCaseSensitive) { if (useUserStore().preferences.sortCaseSensitive) {
if (startsWithUppercase(a.service) && !startsWithUppercase(b.service)) { return a.service.normalize("NFD").replace(/[\u0300-\u036f]/g, "") > b.service.normalize("NFD").replace(/[\u0300-\u036f]/g, "") ? 1 : -1
return -1;
} else if (startsWithUppercase(b.service) && !startsWithUppercase(a.service)) {
return 1;
}
} }
return a.service.localeCompare(b.service, useUserStore().preferences.lang) return a.service.localeCompare(b.service, useUserStore().preferences.lang)
}); });
this.saveOrder() this.saveOrder()
}, },
@ -201,14 +199,12 @@ export const useTwofaccounts = defineStore({
sortDesc() { sortDesc() {
this.items.sort(function(a, b) { this.items.sort(function(a, b) {
if (useUserStore().preferences.sortCaseSensitive) { if (useUserStore().preferences.sortCaseSensitive) {
if (startsWithUppercase(a.service) && !startsWithUppercase(b.service)) { return a.service.normalize("NFD").replace(/[\u0300-\u036f]/g, "") < b.service.normalize("NFD").replace(/[\u0300-\u036f]/g, "") ? 1 : -1
return 1;
} else if (startsWithUppercase(b.service) && !startsWithUppercase(a.service)) {
return -1;
}
} }
return b.service.localeCompare(a.service, useUserStore().preferences.lang) return b.service.localeCompare(a.service, useUserStore().preferences.lang)
}); });
this.saveOrder() this.saveOrder()
}, },