holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tinyMCE editor not respecting preferred font size/family.

Browse Source
This commit is contained in:
Hadi Nategh 2019-01-14 10:37:07 +01:00
parent f09ffe0036
commit ada528bff6
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,6 +163,15 @@ var et2_htmlarea = (function(){ "use strict"; return et2_editableWidget.extend([
"MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;"+ "MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;"+
"Wingdings=wingdings,zapf dingbats", "Wingdings=wingdings,zapf dingbats",
fontsize_formats: '8pt 10pt 12pt 14pt 18pt 24pt 36pt', 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');
});
}
}; };
// extend default settings with configured options and preferences // extend default settings with configured options and preferences
@ -280,9 +289,6 @@ var et2_htmlarea = (function(){ "use strict"; return et2_editableWidget.extend([
// current focus. // current focus.
var focusedEl = jQuery(':focus'); var focusedEl = jQuery(':focus');
this.editor = _editor; this.editor = _editor;
this.editor.execCommand('fontName', true, egw.preference('rte_font', 'common'));
this.editor.execCommand('fontSize', true, egw.preference('rte_font_size', 'common')
+ egw.preference('rte_font_unit', 'common'));
if (!this.disabled) jQuery(this.editor.editorContainer).css('display', 'flex'); if (!this.disabled) jQuery(this.editor.editorContainer).css('display', 'flex');
this.tinymce_container = this.editor.editorContainer; this.tinymce_container = this.editor.editorContainer;
// go back to reserved focused element // go back to reserved focused element