From e019f2d0f2dc2fbfa345ab5d7ae85e67bfdd76b8 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 25 Sep 2010 09:03:53 -0400
Subject: [PATCH] - s/RoundCube/Roundcube/
---
program/js/editor.js | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/program/js/editor.js b/program/js/editor.js
index 6cf3c6a..85cf68a 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -1,9 +1,9 @@
/*
+-----------------------------------------------------------------------+
- | RoundCube editor js library |
+ | Roundcube editor js library |
| |
- | This file is part of the RoundCube web development suite |
- | Copyright (C) 2006, RoundCube Dev, - Switzerland |
+ | This file is part of the Roundcube web development suite |
+ | Copyright (C) 2006, Roundcube Dev, - Switzerland |
| Licensed under the GNU GPL |
| |
+-----------------------------------------------------------------------+
@@ -54,19 +54,23 @@
spellchecker_languages : (rcmail.env.spellcheck_langs ? rcmail.env.spellcheck_langs : 'Dansk=da,Deutsch=de,+English=en,Espanol=es,Francais=fr,Italiano=it,Nederlands=nl,Polski=pl,Portugues=pt,Suomi=fi,Svenska=sv'),
spellchecker_rpc_url : '?_task=utils&_action=spell&tiny=1',
gecko_spellcheck : true,
- relative_urls : false,
remove_script_host : false,
+ relative_urls : false,
rc_client : rcmail,
oninit : 'rcmail_editor_callback'
});
}
// react to real individual tinyMCE editor init
-function rcmail_editor_callback(editor)
+function rcmail_editor_callback()
{
- var editor, elem = rcube_find_object('_from');
- if (elem && elem.type=='select-one')
+ var elem = rcube_find_object('_from');
+ if (elem && elem.type=='select-one') {
rcmail.change_identity(elem);
+ // Focus previously focused element
+ 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);
// Trigger resize (needed for proper editor resizing in some browsers using default skin)
@@ -113,6 +117,7 @@
if (flagElement && (flag = rcube_find_object(flagElement)))
flag.value = '0';
- rcube_find_object(rcmail.env.composebody).focus();
+ if (rcmail.env.composebody)
+ rcube_find_object(rcmail.env.composebody).focus();
}
}
--
Gitblit v1.9.1