From 686af0c6a12d9082fa71537baf9694babbdc710d Mon Sep 17 00:00:00 2001 From: zadam Date: Mon, 27 Nov 2023 10:22:54 +0100 Subject: [PATCH] when canvas and mermaid are inserted using "include note", we insert them as images --- src/public/app/widgets/dialogs/include_note.js | 2 +- src/public/app/widgets/type_widgets/editable_text.js | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/public/app/widgets/dialogs/include_note.js b/src/public/app/widgets/dialogs/include_note.js index 7fb1e4c25..f4d81778d 100644 --- a/src/public/app/widgets/dialogs/include_note.js +++ b/src/public/app/widgets/dialogs/include_note.js @@ -97,7 +97,7 @@ export default class IncludeNoteDialog extends BasicWidget { const boxSize = $("input[name='include-note-box-size']:checked").val(); - if (note.type === 'image') { + if (['image', 'canvas', 'mermaid'].includes(note.type)) { // there's no benefit to use insert note functionlity for images, // so we'll just add an IMG tag this.textTypeWidget.addImage(noteId); diff --git a/src/public/app/widgets/type_widgets/editable_text.js b/src/public/app/widgets/type_widgets/editable_text.js index d2c601658..48cb041aa 100644 --- a/src/public/app/widgets/type_widgets/editable_text.js +++ b/src/public/app/widgets/type_widgets/editable_text.js @@ -368,9 +368,7 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget { const encodedTitle = encodeURIComponent(note.title); const src = `api/images/${note.noteId}/${encodedTitle}`; - const imageElement = writer.createElement( 'image', { 'src': src } ); - - this.watchdog.editor.model.insertContent(imageElement, this.watchdog.editor.model.document.selection); + this.watchdog.editor.execute( 'insertImage', { source: src } ); } ); }