From c1bc8f6c827a27540b5510b42dcc65b39d38f2c1 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 14 Oct 2013 07:19:37 -0400
Subject: [PATCH] Change so abort=true does not break the loop in exec_hook(), provide a new 'break' flag for this purpose
---
program/js/editor.js | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/program/js/editor.js b/program/js/editor.js
index 240ec88..6d7b953 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -74,13 +74,20 @@
// 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 (elem && elem.type == 'select-one' && !rcmail.env.opened_extwin) {
+ if (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);
// Focus previously focused element
if (fe && fe.id != rcmail.env.composebody) {
--
Gitblit v1.9.1