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

* Mail: Fix htmlEditor does not include styling on each tag causing mail content sent with no styling

Browse Source
This commit is contained in:
Hadi Nategh 2022-05-03 15:28:21 +02:00
parent 38d44ee3e2
commit ed5e7414ac
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -276,9 +276,10 @@ export class et2_htmlarea extends et2_editableWidget implements et2_IResizeable
{ {
ed.on('init', function() ed.on('init', function()
{ {
this.getDoc().body.style.fontSize = <string><unknown>egw.preference('rte_font_size', 'common') this.focus();
+ egw.preference('rte_font_unit', 'common'); this.execCommand('fontName', false, egw.preference('rte_font', 'common'));
this.getDoc().body.style.fontFamily = egw.preference('rte_font', 'common'); this.execCommand('fontSize', false, <string><unknown>egw.preference('rte_font_size', 'common')
+ egw.preference('rte_font_unit', 'common'));
}); });
} }
}; };
@ -295,6 +296,9 @@ export class et2_htmlarea extends et2_editableWidget implements et2_IResizeable
{ {
self.editor.formatter.toggle(<string><unknown>egw.preference('rte_formatblock', 'common')); self.editor.formatter.toggle(<string><unknown>egw.preference('rte_formatblock', 'common'));
jQuery(self.editor.editorContainer).height(self.options.height); jQuery(self.editor.editorContainer).height(self.options.height);
self.editor.execCommand('fontName', false, egw.preference('rte_font', 'common'));
self.editor.execCommand('fontSize', false, <string><unknown>egw.preference('rte_font_size', 'common')
+ egw.preference('rte_font_unit', 'common'));
jQuery(self.editor.iframeElement.contentWindow.document).on('dragenter', function(){ jQuery(self.editor.iframeElement.contentWindow.document).on('dragenter', function(){
if (jQuery('#dragover-tinymce').length < 1) jQuery("<style id='dragover-tinymce'>.dragover:after {height:calc(100% - "+jQuery(this).height()+"px) !important;}</style>").appendTo('head'); if (jQuery('#dragover-tinymce').length < 1) jQuery("<style id='dragover-tinymce'>.dragover:after {height:calc(100% - "+jQuery(this).height()+"px) !important;}</style>").appendTo('head');
}); });