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

introduced NoteFull entity, fixes

Browse Source
This commit is contained in:
azivner
2018-03-25 23:25:17 -04:00
parent cdf94181d2
commit 35998058ce
15 changed files with 184 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/public/javascripts/services/tree.js
View File

@@ -12,6 +12,7 @@ import recentNotesDialog from '../dialogs/recent_notes.js';
import editTreePrefixDialog from '../dialogs/edit_tree_prefix.js';
import treeCache from './tree_cache.js';
import infoService from "./info.js";
import Branch from '../entities/branch.js';
const $tree = $("#tree");
const $parentList = $("#parent-list");
@@ -615,25 +616,22 @@ function initFancyTree(branch) {
}
async function loadSearchNote(searchNoteId) {
const note = await server.get('notes/' + searchNoteId);
const json = JSON.parse(note.detail.content);
const noteIds = await server.get('search/' + encodeURIComponent(json.searchString));
const searchNote = await noteDetailService.loadNote(searchNoteId);
const noteIds = await server.get('search/' + encodeURIComponent(searchNote.jsonContent.searchString));
for (const noteId of noteIds) {
const branchId = "virt" + utils.randomString(10);
treeCache.addBranch({
branchId: branchId,
const branch = new Branch(treeCache, {
branchId: "virt" + utils.randomString(10),
noteId: noteId,
parentNoteId: searchNoteId,
prefix: '',
virtual: true
});
treeCache.addBranch(branch);
}
return await prepareBranchInner(await treeCache.getNote(searchNoteId));
return await prepareBranchInner(searchNote);
}
function getTree() {