extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-07 02:32:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

trying "harder" to set users default font and -size in TinyMCE

Browse Source
This commit is contained in:
ralf 2022-05-09 18:37:35 +02:00
parent d8119802ed
commit 5791ef0117
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,6 @@
* @link https://www.egroupware.org * @link https://www.egroupware.org
* @author Hadi Nategh <hn@egroupware.org> * @author Hadi Nategh <hn@egroupware.org>
* @copyright Hadi Nategh <hn@egroupware.org> * @copyright Hadi Nategh <hn@egroupware.org>
* @version $Id$
*/ */
/*egw:uses /*egw:uses
@ -236,6 +235,11 @@ export class et2_htmlarea extends et2_editableWidget implements et2_IResizeable
theme: 'silver' theme: 'silver'
}, },
formats: { formats: {
// setting p (and below also the preferred formatblock) to the users font and -size preference
p: { block: 'p', styles: {
"font-family": (egw.preference('rte_font', 'common') || 'arial, helvetica, sans-serif'),
"font-size": (egw.preference('rte_font_size', 'common') || '10')+'pt'
}},
customparagraph: { block: 'p', styles: {"margin-block-start": "0px", "margin-block-end": "0px"}} customparagraph: { block: 'p', styles: {"margin-block-start": "0px", "margin-block-end": "0px"}}
}, },
min_height: 100, min_height: 100,
@ -272,6 +276,10 @@ export class et2_htmlarea extends et2_editableWidget implements et2_IResizeable
"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',
// this displays all p and li with the users default font and -size (only kosmetik, as TinyMCE does not return or set these styles!)
content_style: (egw.preference('rte_formatblock', 'common') || 'p')+',li'+
' { font-family: '+(egw.preference('rte_font', 'common') || 'arial, helvetica, sans-serif')+
'; font-size: '+(egw.preference('rte_font_size', 'common') || '10')+'pt }',
setup : function(ed) setup : function(ed)
{ {
ed.on('init', function() ed.on('init', function()
@ -282,7 +290,12 @@ export class et2_htmlarea extends et2_editableWidget implements et2_IResizeable
}); });
} }
}; };
const rte_formatblock = <string>(egw.preference('rte_formatblock', 'common') || 'p');
if (rte_formatblock !== 'p')
{
settings.formats[rte_formatblock] = jQuery.extend(true, {}, settings.formats.p);
settings.formats[rte_formatblock].block = rte_formatblock;
}
// extend default settings with configured options and preferences // extend default settings with configured options and preferences
jQuery.extend(settings, this._extendedSettings()); jQuery.extend(settings, this._extendedSettings());
this.tinymce = tinymce.init(settings); this.tinymce = tinymce.init(settings);