holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests 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:49:38 +02:00
parent b62b523d93
commit 2e7451f283
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,9 +137,10 @@ var et2_htmlarea = /** @class */ (function (_super) {
fontsize_formats: '8pt 10pt 12pt 14pt 18pt 24pt 36pt',
setup: function (ed) {
ed.on('init', function () {
this.getDoc().body.style.fontSize = egw.preference('rte_font_size', 'common')
+ egw.preference('rte_font_unit', 'common');
this.getDoc().body.style.fontFamily = egw.preference('rte_font', 'common');
this.focus();
this.execCommand('fontName', false, egw.preference('rte_font', 'common'));
this.execCommand('fontSize', false, egw.preference('rte_font_size', 'common')
+ egw.preference('rte_font_unit', 'common'));
});
}
};
@ -154,6 +155,9 @@ var et2_htmlarea = /** @class */ (function (_super) {
if (self.editor && self.editor.editorContainer) {
self.editor.formatter.toggle(egw.preference('rte_formatblock', 'common'));
jQuery(self.editor.editorContainer).height(self.options.height);
self.editor.execCommand('fontName', false, egw.preference('rte_font', 'common'));
self.editor.execCommand('fontSize', false, egw.preference('rte_font_size', 'common')
+ egw.preference('rte_font_unit', 'common'));
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');

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

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