self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-11 18:24:43 +02:00
Code Issues Releases Activity

Desktop: TinyMCE: Fixed undo issue when pasting text

Browse Source
This commit is contained in:
Laurent Cozic 2020-05-05 00:01:13 +00:00
parent f2a1597ecc
commit d65706aa9c
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx
View File

@ -669,7 +669,11 @@ const TinyMCE = (props:NoteBodyEditorProps, ref:any) => {
// - Make a change
// - Load note 2
// - Undo => content is that of note 1
editor.undoManager.clear();
// The doc is not very clear what's the different between
// clear() and reset() but it seems reset() works best, in
// particular for the onPaste bug.
editor.undoManager.reset();
dispatchDidUpdate(editor);
};
@ -780,6 +784,11 @@ const TinyMCE = (props:NoteBodyEditorProps, ref:any) => {
const result = await markupToHtml.current(MarkupToHtml.MARKUP_LANGUAGE_MARKDOWN, pastedText, markupRenderOptions({ bodyOnly: true }));
editor.insertContent(result.html);
} else {
// HACK: TinyMCE doesn't add an undo step when pasting, for unclear reasons
// so we manually add it here. We also can't do it immediately it seems, or
// else nothing is added to the stack, so do it on the next frame.
window.requestAnimationFrame(() => editor.undoManager.add());
onChangeHandler();
}
}