webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-28 17:02:04 +03:00
Code Activity

Ensured wysiwyg details contents are wrapped in block elements

Browse Source 
Fixes issue where inline-only content would disappear when unwrapping a
details block element.
This commit is contained in:
Dan Brown
2022-07-23 11:18:03 +01:00
parent a9ee2e6889
commit f86bb27a83
3 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
resources/js/wysiwyg/plugins-details.js
View File

@ -2,6 +2,7 @@
* @param {Editor} editor
* @param {String} url
*/
import {blockElementTypes} from "./util";
function register(editor, url) {
@ -217,14 +218,26 @@ function ensureDetailsWrappedInEditable(detailsEl) {
unwrapDetailsEditable(detailsEl);
detailsEl.attr('contenteditable', 'false');
const wrap = tinymce.html.Node.create('doc-root', {contenteditable: 'true'});
const rootWrap = tinymce.html.Node.create('doc-root', {contenteditable: 'true'});
let previousBlockWrap = null;
for (const child of detailsEl.children()) {
if (child.name !== 'summary') {
wrap.append(child);
if (child.name === 'summary') continue;
const isBlock = blockElementTypes.includes(child.name);
if (!isBlock) {
if (!previousBlockWrap) {
previousBlockWrap = tinymce.html.Node.create('p');
rootWrap.append(previousBlockWrap);
}
previousBlockWrap.append(child);
} else {
rootWrap.append(child);
previousBlockWrap = null;
}
}
detailsEl.append(wrap);
detailsEl.append(rootWrap);
}
/**