sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes

pull/255/head
zadam 2023-04-16 09:26:52 +07: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
Unescape Escape View File

@ -12,7 +12,6 @@ const TaskContext = require("../../services/task_context");
const dayjs = require("dayjs");
const utc = require('dayjs/plugin/utc');
const eventService = require("../../services/events");
const froca = require("../../public/app/services/froca.js");
dayjs.extend(utc);
const LABEL = 'label';
@ -1201,7 +1200,7 @@ class BNote extends AbstractBeccaEntity {
const notePaths = this.getAllNotePaths().map(path => ({
notePath: path,
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')
}));

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

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