extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-27 18:33:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Mail: fix diverse problems of rich-text editor, if small paragraphs are used

Browse Source
This commit is contained in:
ralf 2024-01-23 13:54:26 +02:00
parent 10f6dccd5d
commit 47f478550e
1 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
api/js/etemplate/et2_widget_htmlarea.ts
View File

@ -507,12 +507,16 @@ export class et2_htmlarea extends et2_editableWidget implements et2_IResizeable
this.htmlNode = null;
super.destroy();
}
set_value(_value)
{
this._oldValue = _value;
if (this.editor)
{
this.editor.setContent(_value);
// need to defer a little, so TinyMCE does its modifications we want to counter
window.setTimeout(() => this.wrapTextNodes(), 1);
}
else
{
@ -528,6 +532,18 @@ export class et2_htmlarea extends et2_editableWidget implements et2_IResizeable
this.value = _value;
}
/**
* Overwrite isValid to first "fix" the TinyMCE content, see wrapTextNodes
*
* @param _values
*/
isValid(_messages)
{
this.wrapTextNodes();
return super.isValid(_messages);
}
getValue()
{
if (this.editor)
@ -537,6 +553,47 @@ export class et2_htmlarea extends et2_editableWidget implements et2_IResizeable
return this.options.readonly ? this.value : this.htmlNode.val();
}
/**
* Wrap text-nodes and other non-block elements with <p></p> as TinyMCE produces them, if we use small paragraphs
*
* This is done to create valid HTML and allow to set our default font, see applyDefaultFont(),
* which can NOT set a font on text-nodes or br!
*/
wrapTextNodes()
{
const body : HTMLBodyElement = this.editor?.editorContainer.querySelector('iframe').contentDocument.querySelector('body');
if (!body) return false;
let toWrap : ChildNode[] = [];
body.childNodes.forEach((node) =>
{
const text_non_block_node = node.nodeType === node.TEXT_NODE ||
node.nodeType === node.ELEMENT_NODE && typeof node.computedStyleMap !== 'undefined' && node.computedStyleMap().get('display')?.value !== 'block';
if (text_non_block_node)
{
toWrap.push(node);
}
if ((!text_non_block_node || node === body.lastChild) && toWrap.length)
{
const wrap = body.ownerDocument.createElement('p');
toWrap.forEach((node) =>
{
wrap.appendChild(node === toWrap[0] ?
body.replaceChild(wrap, node) :
body.removeChild(node));
});
toWrap = [];
}
});
// TinyMCE inserts a BR in the first P --> remove it, if it's not the only child, as it is not wanted (moves the text down on each submit)
const firstChild = body.firstChild;
if (firstChild.nodeName === 'P' && firstChild.firstChild !== firstChild.lastChild && firstChild.firstChild.nodeName === 'BR')
{
firstChild.removeChild(firstChild.firstChild);
}
return true;
}
/**
* Apply default font and -size
*/
@ -544,6 +601,10 @@ export class et2_htmlarea extends et2_editableWidget implements et2_IResizeable
{
const edit_area = this.editor?.editorContainer.querySelector('iframe').contentDocument;
if (!edit_area) return false;
// we first need to wrap all text and non-block elements in p, to be able to set a font
this.wrapTextNodes();
const font_family = egw.preference('rte_font', 'common') || 'arial, helvetica, sans-serif';
edit_area.querySelectorAll('h1:not([style*="font-family"]),h2:not([style*="font-family"]),h3:not([style*="font-family"]),h4:not([style*="font-family"]),h5:not([style*="font-family"]),h6:not([style*="font-family"]),' +
'div:not([style*="font-family"]),li:not([style*="font-family"]),p:not([style*="font-family"]),blockquote:not([style*="font-family"]),' +