From 8e8f3b96b51fde1df953de7398b15e0f01e10777 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 17 Jan 2013 12:47:01 -0500
Subject: [PATCH] Fix export of selected contacts from search result (#1488905)
---
program/js/editor.js | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/program/js/editor.js b/program/js/editor.js
index 37d56b3..3782de8 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -27,6 +27,7 @@
theme_advanced_toolbar_location: 'top',
theme_advanced_toolbar_align: 'left',
theme_advanced_buttons3: '',
+ theme_advanced_statusbar_location: 'none',
extended_valid_elements: 'font[face|size|color|style],span[id|class|align|style]',
relative_urls: false,
remove_script_host: false,
@@ -44,11 +45,11 @@
});
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'
@@ -79,12 +80,15 @@
if (rcmail.env.default_font)
$(tinyMCE.get(rcmail.env.composebody).getBody()).css('font-family', rcmail.env.default_font);
- if (elem && elem.type == 'select-one') {
+ if (elem && elem.type == 'select-one' && !rcmail.env.opened_extwin) {
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);
}
}
--
Gitblit v1.9.1