summaryrefslogtreecommitdiff
path: root/program/js/editor.js
diff options
context:
space:
mode:
authorThomas B. <thomas@roundcube.net>2013-09-16 10:47:24 -0700
committerThomas B. <thomas@roundcube.net>2013-09-16 10:47:24 -0700
commit0201298cd8f767389789f7c35897985d4475836a (patch)
tree49ba49fade3e2dd998a569e1694c5e31ad301af3 /program/js/editor.js
parentb5c364273d7b026c0deda2326018aabff8bec73c (diff)
parent153e455f6566cb7a4349b7f2197e842d6ec9bf90 (diff)
Merge pull request #118 from Dennis1993/patch-12
Added support for default font size and fix legacy code for default font
Diffstat (limited to 'program/js/editor.js')
-rw-r--r--program/js/editor.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/program/js/editor.js b/program/js/editor.js
index e403d1f63..e1ef36835 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -80,6 +80,9 @@ function rcmail_editor_callback()
if (rcmail.env.default_font)
$(tinyMCE.get(rcmail.env.composebody).getBody()).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);
+
if (elem && elem.type == 'select-one') {
rcmail.change_identity(elem);
// Focus previously focused element