diff options
Diffstat (limited to 'program/js/editor.js')
| -rw-r--r-- | program/js/editor.js | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/program/js/editor.js b/program/js/editor.js index 702ca1cd4..bc36e9a39 100644 --- a/program/js/editor.js +++ b/program/js/editor.js @@ -45,11 +45,11 @@ function rcmail_editor_init(config) }); else { // mail compose $.extend(conf, { - plugins: 'paste,emotions,media,nonbreaking,table,searchreplace,visualchars,directionality,tabfocus' + (config.spellcheck ? ',spellchecker' : ''), + plugins: 'paste,emotions,media,nonbreaking,table,searchreplace,visualchars,directionality,inlinepopups,tabfocus' + (config.spellcheck ? ',spellchecker' : ''), theme_advanced_buttons1: 'bold,italic,underline,|,justifyleft,justifycenter,justifyright,justifyfull,|,bullist,numlist,outdent,indent,ltr,rtl,blockquote,|,forecolor,backcolor,fontselect,fontsizeselect', theme_advanced_buttons2: 'link,unlink,table,|,emotions,charmap,image,media,|,code,search,undo,redo', 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_html', + spellchecker_rpc_url: '?_task=utils&_action=spell_html&_remote=1', spellchecker_enable_learn_rpc: config.spelldict, accessibility_focus: false, oninit: 'rcmail_editor_callback' @@ -84,8 +84,11 @@ function rcmail_editor_callback() rcmail.change_identity(elem); // Focus previously focused element if (fe && fe.id != rcmail.env.composebody) { - window.focus(); // for WebKit (#1486674) - fe.focus(); + // use setTimeout() for IE9 (#1488541) + window.setTimeout(function() { + window.focus(); // for WebKit (#1486674) + fe.focus(); + }, 10); } } |