summaryrefslogtreecommitdiff
path: root/program/js
diff options
context:
space:
mode:
Diffstat (limited to 'program/js')
-rw-r--r--program/js/editor.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/program/js/editor.js b/program/js/editor.js
index 48d8cfa88..455558233 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -62,13 +62,14 @@ function rcmail_editor_init(skin_path, editor_lang, spellcheck, mode)
}
// react to real individual tinyMCE editor init
-function rcmail_editor_callback(editor)
+function rcmail_editor_callback()
{
- var editor, elem = rcube_find_object('_from');
+ var elem = rcube_find_object('_from');
if (elem && elem.type=='select-one') {
rcmail.change_identity(elem);
// Focus previously focused element
- rcmail.env.compose_focus_elem.focus();
+ if (rcmail.env.compose_focus_elem.id != rcmail.env.composebody)
+ rcmail.env.compose_focus_elem.focus();
}
// set tabIndex and set focus to element that was focused before
rcmail_editor_tabindex(rcmail.env.compose_focus_elem && rcmail.env.compose_focus_elem.id == rcmail.env.composebody);