Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 01:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updated tinymce code block handling to help prevent breaking history states

Browse Source 
Only used an undo transaction on startup and added a small delay
to codeMirror parsing on SetContent's to help avoid
the rendering activities getting caught in undoManager states.
Seemed to improve things a lot in Firefox & chrome on my dev machine.

For #2602
This commit is contained in:
Dan Brown 2021-04-19 22:00:33 +01:00
parent 9df4dee1b2
commit 70be28d22c
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
resources/js/components/wysiwyg-editor.js
View File

@ -152,8 +152,8 @@ function codePlugin() {
return; return;
} }
let lang = selectedNode.hasAttribute('data-lang') ? selectedNode.getAttribute('data-lang') : ''; const lang = selectedNode.hasAttribute('data-lang') ? selectedNode.getAttribute('data-lang') : '';
let currentCode = selectedNode.querySelector('textarea').textContent; const currentCode = selectedNode.querySelector('textarea').textContent;
window.components.first('code-editor').open(currentCode, lang, (code, lang) => { window.components.first('code-editor').open(currentCode, lang, (code, lang) => {
const editorElem = selectedNode.querySelector('.CodeMirror'); const editorElem = selectedNode.querySelector('.CodeMirror');
@ -225,22 +225,23 @@ function codePlugin() {
return elem.contentEditable !== "false"; return elem.contentEditable !== "false";
}); });
if (!codeSamples.length) return;
editor.undoManager.transact(function () {
codeSamples.each((index, elem) => { codeSamples.each((index, elem) => {
Code.wysiwygView(elem); Code.wysiwygView(elem);
}); });
});
} }
editor.on('init', function() { editor.on('init', function() {
// Parse code mirror instances on init, but delay a little so this runs after // Parse code mirror instances on init, but delay a little so this runs after
// initial styles are fetched into the editor. // initial styles are fetched into the editor.
editor.undoManager.transact(function () {
parseCodeMirrorInstances(); parseCodeMirrorInstances();
});
// Parsed code mirror blocks when content is set but wait before setting this handler // Parsed code mirror blocks when content is set but wait before setting this handler
// to avoid any init 'SetContent' events. // to avoid any init 'SetContent' events.
setTimeout(() => { setTimeout(() => {
editor.on('SetContent', parseCodeMirrorInstances); editor.on('SetContent', () => {
setTimeout(parseCodeMirrorInstances, 100);
});
}, 200); }, 200);
}); });