- Improve r4038: we can use keypress on FF and Opera, here we've got repetition

- Small code cleanup
release-0.6
alecpl 14 years ago
parent 8cfbc47e89
commit c288f9969e

@ -2768,7 +2768,7 @@ function rcube_webmail()
this.init_address_input_events = function(obj) this.init_address_input_events = function(obj)
{ {
obj.keydown(function(e){ return ref.ksearch_keydown(e, this); }) obj[bw.ie || bw.safari || bw.chrome ? 'keydown' : 'keypress'](function(e){ return ref.ksearch_keydown(e, this); })
.attr('autocomplete', 'off'); .attr('autocomplete', 'off');
}; };

@ -64,15 +64,18 @@ function rcmail_editor_init(skin_path, editor_lang, spellcheck, mode)
// react to real individual tinyMCE editor init // react to real individual tinyMCE editor init
function rcmail_editor_callback() function rcmail_editor_callback()
{ {
var elem = rcube_find_object('_from'); var elem = rcube_find_object('_from'),
if (elem && elem.type=='select-one') { fe = rcmail.env.compose_focus_elem;
if (elem && elem.type == 'select-one') {
rcmail.change_identity(elem); rcmail.change_identity(elem);
// Focus previously focused element // Focus previously focused element
if (rcmail.env.compose_focus_elem && rcmail.env.compose_focus_elem.id != rcmail.env.composebody) if (fe && fe.id != rcmail.env.composebody)
rcmail.env.compose_focus_elem.focus(); fe.focus();
} }
// set tabIndex and set focus to element that was focused before // 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); rcmail_editor_tabindex(fe && fe.id == rcmail.env.composebody);
// Trigger resize (needed for proper editor resizing in some browsers using default skin) // Trigger resize (needed for proper editor resizing in some browsers using default skin)
$(window).resize(); $(window).resize();
} }

Loading…
Cancel
Save