gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 09:58:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

FIXME comment on virtual branches

Browse Source
This commit is contained in:
zadam 2022-09-24 23:03:38 +02:00
parent e3b2bbdca5
commit a9c0daa51a
3 changed files with 448 additions and 432 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

872
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

6
package.json
View File

@ -57,7 +57,7 @@
"ini": "3.0.1", "ini": "3.0.1",
"is-animated": "2.0.2", "is-animated": "2.0.2",
"is-svg": "4.3.2", "is-svg": "4.3.2",
"jimp": "0.16.1", "jimp": "0.16.2",
"joplin-turndown-plugin-gfm": "1.0.12", "joplin-turndown-plugin-gfm": "1.0.12",
"jsdom": "20.0.0", "jsdom": "20.0.0",
"mime-types": "2.1.35", "mime-types": "2.1.35",
@ -72,7 +72,7 @@
"rimraf": "3.0.2", "rimraf": "3.0.2",
"safe-compare": "1.1.4", "safe-compare": "1.1.4",
"sanitize-filename": "1.6.3", "sanitize-filename": "1.6.3",
"sanitize-html": "2.7.1", "sanitize-html": "2.7.2",
"sax": "1.2.4", "sax": "1.2.4",
"semver": "7.3.7", "semver": "7.3.7",
"serve-favicon": "2.5.0", "serve-favicon": "2.5.0",
@ -82,7 +82,7 @@
"tmp": "0.2.1", "tmp": "0.2.1",
"turndown": "7.1.1", "turndown": "7.1.1",
"unescape": "1.0.1", "unescape": "1.0.1",
"ws": "8.8.1", "ws": "8.9.0",
"yauzl": "2.10.0" "yauzl": "2.10.0"
}, },
"devDependencies": { "devDependencies": {

2
src/becca/entities/note.js
View File

@ -698,7 +698,7 @@ class Note extends AbstractEntity {
// this is done so that non-search & non-archived paths are always explored as first when looking for note path // this is done so that non-search & non-archived paths are always explored as first when looking for note path
sortParents() { sortParents() {
this.parentBranches.sort((a, b) => this.parentBranches.sort((a, b) =>
a.branchId.startsWith('virt-') a.branchId.startsWith('virt-') // FIXME: search virtual notes appear only in froca so this is probably not necessary
|| a.parentNote?.hasInheritableOwnedArchivedLabel() ? 1 : -1); || a.parentNote?.hasInheritableOwnedArchivedLabel() ? 1 : -1);
this.parents = this.parentBranches this.parents = this.parentBranches