extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-15 02:42:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

new boolean property applyDefaultFont for rtf editor and using it in mail compose

Browse Source 
making sure it applyDefaultFont method gets always called in compose
This commit is contained in:
ralf
2024-02-05 10:54:06 +02:00
parent da960e96d2
commit 639c8748ca
4 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,6 +100,12 @@ export class et2_htmlarea extends et2_editableWidget implements et2_IResizeable
'type': 'string',
'default': 'floating',
'description': 'It allows to extend the toolbar to accommodate the overflowing toolbar buttons. {floating, sliding, scrolling, wrap}'
},
applyDefaultFont: {
name: 'apply default font and size',
type: 'boolean',
default: false,
description: 'Add default font and size as style attribute to the markup. Also ensures all non-block elements are wrapped in p.'
}
};
@ -516,7 +522,10 @@ export class et2_htmlarea extends et2_editableWidget implements et2_IResizeable
this.editor.setContent(_value);
// need to defer a little, so TinyMCE does its modifications we want to counter
window.setTimeout(() => this.wrapTextNodes(), 1);
if (this.options.applyDefaultFont)
{
window.setTimeout(() => this.wrapTextNodes(), 10);
}
}
else
{
@ -532,22 +541,16 @@ 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)
{
// are we called by etemplate2.getValues() (has a closure result)
// not always setting it, as getValue() is called a lot, e.g. to test input is dirty
if (this.options.applyDefaultFont && typeof result !== 'undefined')
{
this.applyDefaultFont();
}
return this.editor.getContent();
}
return this.options.readonly ? this.value : this.htmlNode.val();