extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-18 20:51:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

preset font span, omit empty style elements completely

Browse Source
This commit is contained in:
Klaus Leithoff 2013-02-22 09:33:40 +00:00
parent 8fef5d106d
commit 945f256e1b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
felamimail/inc/class.uicompose.inc.php
View File

@ -669,7 +669,7 @@
// User preferences for style // User preferences for style
$font = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font']; $font = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font'];
$font_size = egw_ckeditor_config::font_size_from_prefs(); $font_size = egw_ckeditor_config::font_size_from_prefs();
$font_span = '<span '.($font||$font_size?'style="':'').($font?'font-family:'.$font.'; ':'').';'.($font_size?'font-size:'.$font_size.'; ':'').'">'.'&nbsp;'.'</span>'; $font_span = '<span '.($font||$font_size?'style="':'').($font?'font-family:'.$font.'; ':'').($font_size?'font-size:'.$font_size.'; ':'').'">'.'&nbsp;'.'</span>';
if (empty($font) && empty($font_size)) $font_span = ''; if (empty($font) && empty($font_size)) $font_span = '';
} }
//remove possible html header stuff //remove possible html header stuff

6
phpgwapi/inc/class.html.inc.php
View File

@ -526,6 +526,8 @@ class html
// User preferences // User preferences
$font = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font']; $font = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font'];
$font_size = egw_ckeditor_config::font_size_from_prefs(); $font_size = egw_ckeditor_config::font_size_from_prefs();
$font_span = '<span '.($font||$font_size?'style=\"':'').($font?'font-family:'.$font.'; ':'').($font_size?'font-size:'.$font_size.'; ':'').'\">';
if (empty($font) && empty($font_size)) $font_span = '';
// we need to enable double encoding here, as ckEditor has to undo one level of encoding // we need to enable double encoding here, as ckEditor has to undo one level of encoding
// otherwise < and > chars eg. from html markup entered in regular (not source) input, will turn into html! // otherwise < and > chars eg. from html markup entered in regular (not source) input, will turn into html!
@ -542,8 +544,8 @@ class html
ev.editor.resize("100%", '.str_replace('px', '', $pxheight).'); ev.editor.resize("100%", '.str_replace('px', '', $pxheight).');
} }
);'. );'.
(trim($_content) == '' ? 'CKEDITOR.instances["'.$_name.'"].setData("<span style=\"font-family:'.$font.';font-size:'.$font_size.';\">&#8203;</span>");' : '').' (trim($_content) == '' && $font_span ? 'CKEDITOR.instances["'.$_name.'"].setData("'.$font_span.'&#8203;</span>");' : '').
</script> '</script>
'; ';
} }