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

Merge branch 'feature/typescript_backend_2' into feature/typescript_backend_3

Browse Source
This commit is contained in:
Elian Doran
2024-04-03 20:21:13 +03:00
parent 99d50957dd 17c7e2d8e7
commit 5baabecdee
14 changed files with 29 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/services/notes.ts
View File

@@ -745,7 +745,7 @@ function saveRevisionIfNeeded(note: BNote) {
}
}
function updateNoteData(noteId: string, content: string, attachments: BAttachment[] = []) {
function updateNoteData(noteId: string, content: string, attachments: AttachmentRow[] = []) {
const note = becca.getNote(noteId);
if (!note || !note.isContentAvailable()) {
@@ -761,11 +761,7 @@ function updateNoteData(noteId: string, content: string, attachments: BAttachmen
if (attachments?.length > 0) {
const existingAttachmentsByTitle = utils.toMap(note.getAttachments({includeContentLength: false}), 'title');
for (const attachment of attachments) {
// TODO: The content property was extracted directly instead of `getContent`. To investigate.
const {attachmentId, role, mime, title, position} = attachment;
const content = attachment.getContent();
for (const {attachmentId, role, mime, title, position, content} of attachments) {
if (attachmentId || !(title in existingAttachmentsByTitle)) {
note.saveAttachment({attachmentId, role, mime, title, content, position});
} else {
@@ -773,7 +769,9 @@ function updateNoteData(noteId: string, content: string, attachments: BAttachmen
existingAttachment.role = role;
existingAttachment.mime = mime;
existingAttachment.position = position;
existingAttachment.setContent(content, {forceSave: true});
if (content) {
existingAttachment.setContent(content, {forceSave: true});
}
}
}
}
@@ -876,7 +874,7 @@ function getUndeletedParentBranchIds(noteId: string, deleteId: string) {
AND parentNote.isDeleted = 0`, [noteId, deleteId]);
}
function scanForLinks(note: BNote | null, content: string) {
function scanForLinks(note: BNote, content: string) {
if (!note || !['text', 'relationMap'].includes(note.type)) {
return;
}