From 6465a92a38bb42dae3f669e9f2e4f570b6dd5d95 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 25 Sep 2010 06:34:54 -0400
Subject: [PATCH] - Support action in form of "task/action" in goto_url()
---
program/js/editor.js | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/program/js/editor.js b/program/js/editor.js
index c81ef25..4555582 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -24,7 +24,7 @@
theme : 'advanced',
language : editor_lang,
content_css : skin_path + '/editor_content.css',
- plugins: 'paste',
+ plugins: 'paste,tabfocus',
theme_advanced_toolbar_location : 'top',
theme_advanced_toolbar_align : 'left',
theme_advanced_buttons1 : 'bold,italic,underline,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,separator,outdent,indent,charmap,hr,link,unlink,code,forecolor',
@@ -42,7 +42,7 @@
apply_source_formatting : true,
theme : 'advanced',
language : editor_lang,
- plugins : 'paste,emotions,media,nonbreaking,table,searchreplace,visualchars,directionality' + (spellcheck ? ',spellchecker' : ''),
+ plugins : 'paste,emotions,media,nonbreaking,table,searchreplace,visualchars,directionality,tabfocus' + (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,code,|,emotions,charmap,image,media,|,search' + (spellcheck ? ',spellchecker' : '') + ',undo,redo',
theme_advanced_buttons3 : '',
@@ -54,21 +54,27 @@
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)
+ $(window).resize();
}
// set tabIndex on tinyMCE editor
@@ -111,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