summaryrefslogtreecommitdiff
path: root/program/js/editor.js
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-09-20 08:18:54 +0200
committerAleksander Machniak <alec@alec.pl>2013-09-20 08:18:54 +0200
commitb334a01791689a16c8d6b10955df850b891ff40e (patch)
tree34173fc260a63a18ec56b75825cdc0925c84f594 /program/js/editor.js
parent1bfd8ac27aa09421e77b629806dc9f667aa32cb6 (diff)
parentc1ff572e176dc930c52063e53364daa315d34666 (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
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