Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-01 19:05:59 +01:00
Code Issues Packages Projects Releases Activity

add natural sort for notes, introduce new label #sortNatural

Browse Source
This commit is contained in:
Nriver
2023-03-10 14:35:36 +08:00
parent 6b4800d2d6
commit d3ec9f022c
5 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/services/tree.js
View File

@@ -123,7 +123,7 @@ function loadSubtreeNoteIds(parentNoteId, subtreeNoteIds) {
}
}
function sortNotes(parentNoteId, customSortBy = 'title', reverse = false, foldersFirst = false) {
function sortNotes(parentNoteId, customSortBy = 'title', reverse = false, foldersFirst = false, sortNatural = false) {
if (!customSortBy) {
customSortBy = 'title';
}
@@ -153,7 +153,14 @@ function sortNotes(parentNoteId, customSortBy = 'title', reverse = false, folder
}
function compare(a, b) {
return b === null || b === undefined || a < b ? -1 : 1;
if (!sortNatural){
// alphabetical sort
return b === null || b === undefined || a < b ? -1 : 1;
} else {
// alphanumeric sort, or natural sort
return a.localeCompare(b, undefined, {numeric: true, sensitivity: 'base'});
}
}
const topAEl = fetchValue(a, 'top');
@@ -224,8 +231,9 @@ function sortNotesIfNeeded(parentNoteId) {
const sortReversed = parentNote.getLabelValue('sortDirection')?.toLowerCase() === "desc";
const sortFoldersFirstLabel = parentNote.getLabel('sortFoldersFirst');
const sortFoldersFirst = sortFoldersFirstLabel && sortFoldersFirstLabel.value.toLowerCase() !== "false";
sortNotes(parentNoteId, sortedLabel.value, sortReversed, sortFoldersFirst);
const sortNaturalLabel = parentNote.getLabel('sortNatural');
const sortNatural = sortNaturalLabel && sortNaturalLabel.value.toLowerCase() !== "false";
sortNotes(parentNoteId, sortedLabel.value, sortReversed, sortFoldersFirst, sortNatural);
}
/**