banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bring back possibility to unset default font family and font size

Browse Source 
Fix style attribute quoting when font-family contains double quotes
SOme code improvements
pull/129/head
Aleksander Machniak 11 years ago
parent a149d566fc
commit f7b2bfba09
4 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File

10
program/js/editor.js
Unescape Escape View File

@ -74,14 +74,18 @@ function rcmail_editor_init(config)
// react to real individual tinyMCE editor init
function rcmail_editor_callback()
{
var elem = rcube_find_object('_from'),
var css = {},
elem = rcube_find_object('_from'),
fe = rcmail.env.compose_focus_elem;
if (rcmail.env.default_font)
$(tinyMCE.get(rcmail.env.composebody).getBody()).css('font-family', rcmail.env.default_font);
css['font-family'] = rcmail.env.default_font;
if (rcmail.env.default_font_size)
$(tinyMCE.get(rcmail.env.composebody).getBody()).css('font-size', rcmail.env.default_font_size);
css['font-size'] = rcmail.env.default_font_size;
if (css['font-family'] || css['font-size'])
$(tinyMCE.get(rcmail.env.composebody).getBody()).css(css);
if (elem && elem.type == 'select-one') {
rcmail.change_identity(elem);

4
program/steps/mail/compose.inc
Unescape Escape View File

@ -149,7 +149,9 @@ if ($font && !is_array($font)) {
}
// default font size for HTML editor
$OUTPUT->set_env('default_font_size', $RCMAIL->config->get('default_font_size'));
if ($font_size = $RCMAIL->config->get('default_font_size')) {
$OUTPUT->set_env('default_font_size', $font_size);
}
// get reference message and set compose mode
if ($msg_uid = $COMPOSE['param']['draft_uid']) {

16
program/steps/mail/sendmail.inc
Unescape Escape View File

@ -473,13 +473,19 @@ $isHtml = (bool) get_input_value('_is_html', RCUBE_INPUT_POST);
$message_body = get_input_value('_message', RCUBE_INPUT_POST, TRUE, $message_charset);
if ($isHtml) {
$font_family = rcube_fontdefs($RCMAIL->config->get('default_font', 'Arial'));
$font_size = $RCMAIL->config->get('default_font_size');
$bstyle = ' style="font:' . $font_size . ' ' . $font_family . ';"';
$bstyle = array();
if ($font_size = $RCMAIL->config->get('default_font_size')) {
$bstyle[] = 'font-size: ' . $font_size;
}
if ($font_family = $RCMAIL->config->get('default_font')) {
$bstyle[] = 'font-family: ' . rcmail::font_defs($font_family);
}
// append doctype and html/body wrappers
$message_body = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">' .
"\r\n<html><body$bstyle>\r\n" . $message_body;
$message_body = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">'
. "\r\n<html><body" . (!empty($bstyle) ? " style='" . implode($bstyle, '; ') . "'" : '') . ">\r\n"
. $message_body;
}
if (!$savedraft) {

5
program/steps/settings/func.inc
Unescape Escape View File

@ -839,7 +839,7 @@ function rcmail_user_prefs($current = null)
);
}
if (!isset($no_override['default_font'])) {
if (!isset($no_override['default_font']) || !isset($no_override['default_font_size'])) {
if (!$current) {
continue 2;
}
@ -848,7 +848,7 @@ function rcmail_user_prefs($current = null)
$field_id = 'rcmfd_default_font_size';
$select_default_font_size = new html_select(array('name' => '_default_font_size', 'id' => $field_id));
$fontsizes = array('8pt', '10pt', '12pt', '14pt', '18pt', '24pt', '36pt');
$fontsizes = array('', '8pt', '10pt', '12pt', '14pt', '18pt', '24pt', '36pt');
foreach ($fontsizes as $size) {
$select_default_font_size->add($size, $size);
}
@ -856,6 +856,7 @@ function rcmail_user_prefs($current = null)
// Default font
$field_id = 'rcmfd_default_font';
$select_default_font = new html_select(array('name' => '_default_font', 'id' => $field_id));
$select_default_font->add('', '');
$fonts = rcube_fontdefs();
foreach ($fonts as $fname => $font) {

Write Preview
Loading…
Cancel
Save