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

Merge branch 'master' into next53

Browse Source
This commit is contained in:
zadam
2022-06-05 22:25:14 +02:00
parent 9ce3e7e7d2 de1c76ee3c
commit 4211d0feda
17 changed files with 76 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/public/app/services/note_create.js
View File

@@ -24,8 +24,8 @@ async function createNote(parentNotePath, options = {}) {
options.saveSelection = false;
}
if (options.saveSelection && utils.isCKEditorInitialized()) {
[options.title, options.content] = parseSelectedHtml(window.cutToNote.getSelectedHtml());
if (options.saveSelection) {
[options.title, options.content] = parseSelectedHtml(options.textEditor.getSelectedHtml());
}
const parentNoteId = treeService.getNoteIdFromNotePath(parentNotePath);
@@ -47,9 +47,9 @@ async function createNote(parentNotePath, options = {}) {
templateNoteId: options.templateNoteId
});
if (options.saveSelection && utils.isCKEditorInitialized()) {
if (options.saveSelection) {
// we remove the selection only after it was saved to server to make sure we don't lose anything
window.cutToNote.removeSelection();
options.textEditor.removeSelection();
}
await ws.waitForMaxKnownEntityChangeId();