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

Merge branch 'beta'

Browse Source 
# Conflicts:
#	docs/backend_api/BAttachment.html
#	docs/backend_api/BRevision.html
#	docs/backend_api/BackendScriptApi.html
#	docs/backend_api/becca_entities_battachment.js.html
#	docs/backend_api/becca_entities_bblob.js.html
#	docs/backend_api/becca_entities_brevision.js.html
#	docs/frontend_api/FNote.html
#	docs/frontend_api/FrontendScriptApi.html
#	docs/frontend_api/entities_fattachment.js.html
#	docs/frontend_api/entities_fblob.js.html
#	docs/frontend_api/services_frontend_script_api.js.html
#	package-lock.json
#	src/public/app/services/frontend_script_api.js
This commit is contained in:
zadam
2023-09-06 09:24:41 +02:00
parent 72b2a6ecb6 97d8b19868
commit 90fc4b8293
72 changed files with 589 additions and 756 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/frontend_api/entities_fnote.js.html
View File

@@ -167,10 +167,9 @@ class FNote {
}
async getContent() {
// we're not caching content since these objects are in froca and as such pretty long-lived
const note = await server.get(`notes/${this.noteId}`);
const blob = await this.getBlob();
return note.content;
return blob?.content;
}
async getJsonContent() {