gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-04 13:39:01 +01:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
zadam 2023-04-16 09:26:52 +02:00
parent a1d4e062ed
commit 2e794ee38f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/becca/entities/bnote.js
View File

@ -12,7 +12,6 @@ const TaskContext = require("../../services/task_context");
const dayjs = require("dayjs"); const dayjs = require("dayjs");
const utc = require('dayjs/plugin/utc'); const utc = require('dayjs/plugin/utc');
const eventService = require("../../services/events"); const eventService = require("../../services/events");
const froca = require("../../public/app/services/froca.js");
dayjs.extend(utc); dayjs.extend(utc);
const LABEL = 'label'; const LABEL = 'label';
@ -1201,7 +1200,7 @@ class BNote extends AbstractBeccaEntity {
const notePaths = this.getAllNotePaths().map(path => ({ const notePaths = this.getAllNotePaths().map(path => ({
notePath: path, notePath: path,
isInHoistedSubTree: isHoistedRoot || path.includes(hoistedNoteId), isInHoistedSubTree: isHoistedRoot || path.includes(hoistedNoteId),
isArchived: path.some(noteId => froca.notes[noteId].isArchived), isArchived: path.some(noteId => this.becca.notes[noteId].isArchived),
isHidden: path.includes('_hidden') isHidden: path.includes('_hidden')
})); }));

6
src/services/search/expressions/note_flat_text.js
View File

@ -22,10 +22,12 @@ class NoteFlatTextExp extends Expression {
* @param {string[]} tokens * @param {string[]} tokens
* @param {string[]} path * @param {string[]} path
*/ */
function searchDownThePath(note, tokens, path) { const searchDownThePath = (note, tokens, path) => {
if (tokens.length === 0) { if (tokens.length === 0) {
const retPath = this.getNotePath(note, path); const retPath = this.getNotePath(note, path);
console.log(retPath);
if (retPath) { if (retPath) {
const noteId = retPath[retPath.length - 1]; const noteId = retPath[retPath.length - 1];
@ -136,7 +138,7 @@ class NoteFlatTextExp extends Expression {
return note.getBestNotePath(); return note.getBestNotePath();
} else { } else {
const closestNoteId = path[0]; const closestNoteId = path[0];
const closestNoteBestNotePath = becca.getNote(closestNoteId).getBestNotePathString(); const closestNoteBestNotePath = becca.getNote(closestNoteId).getBestNotePath();
return [...closestNoteBestNotePath, ...path.slice(1)]; return [...closestNoteBestNotePath, ...path.slice(1)];
} }