extern/2FAuth
1
0
Fork 0
mirror of https://github.com/Bubka/2FAuth.git synced 2025-06-19 19:28:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix sorting fails when service is null - Closes #438

Browse Source
This commit is contained in:
Bubka 2025-02-25 08:16:05 +01:00
parent 23a0ae31e5
commit 11db01e889
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
resources/js/stores/twofaccounts.js vendored
View File

@ -196,11 +196,14 @@ export const useTwofaccounts = defineStore({
*/ */
sortAsc() { sortAsc() {
this.items.sort(function(a, b) { this.items.sort(function(a, b) {
const serviceA = a.service ?? ''
const serviceB = b.service ?? ''
if (useUserStore().preferences.sortCaseSensitive) { if (useUserStore().preferences.sortCaseSensitive) {
return a.service.normalize("NFD").replace(/[\u0300-\u036f]/g, "") > b.service.normalize("NFD").replace(/[\u0300-\u036f]/g, "") ? 1 : -1 return serviceA.normalize("NFD").replace(/[\u0300-\u036f]/g, "") > serviceB.normalize("NFD").replace(/[\u0300-\u036f]/g, "") ? 1 : -1
} }
return a.service.localeCompare(b.service, useUserStore().preferences.lang) return serviceA.localeCompare(serviceB, useUserStore().preferences.lang)
}); });
this.saveOrder() this.saveOrder()
@ -211,11 +214,14 @@ export const useTwofaccounts = defineStore({
*/ */
sortDesc() { sortDesc() {
this.items.sort(function(a, b) { this.items.sort(function(a, b) {
const serviceA = a.service ?? ''
const serviceB = b.service ?? ''
if (useUserStore().preferences.sortCaseSensitive) { if (useUserStore().preferences.sortCaseSensitive) {
return a.service.normalize("NFD").replace(/[\u0300-\u036f]/g, "") < b.service.normalize("NFD").replace(/[\u0300-\u036f]/g, "") ? 1 : -1 return serviceA.normalize("NFD").replace(/[\u0300-\u036f]/g, "") < serviceB.normalize("NFD").replace(/[\u0300-\u036f]/g, "") ? 1 : -1
} }
return b.service.localeCompare(a.service, useUserStore().preferences.lang) return serviceB.localeCompare(serviceA, useUserStore().preferences.lang)
}); });
this.saveOrder() this.saveOrder()