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 | 66 +++++++++++++-------------------
1 files changed, 27 insertions(+), 39 deletions(-)
diff --git a/program/js/editor.js b/program/js/editor.js
index a5e3af3..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 |
| |
+-----------------------------------------------------------------------+
@@ -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,32 +54,31 @@
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);
- // set tabIndex
- rcmail_editor_tabindex();
- // set focus to element that was focused before
- if (elem = rcmail.env.compose_focus_elem) {
- if (elem.id == rcmail.env.composebody && (editor = tinyMCE.get(rcmail.env.composebody)))
- editor.getWin().focus();
- else
- elem.focus();
+ // 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
-function rcmail_editor_tabindex()
+function rcmail_editor_tabindex(focus)
{
if (rcmail.env.task == 'mail') {
var editor = tinyMCE.get(rcmail.env.composebody);
@@ -88,6 +87,8 @@
var node = editor.getContentAreaContainer().childNodes[0];
if (textarea && node)
node.tabIndex = textarea.tabIndex;
+ if (focus)
+ editor.getWin().focus();
}
}
}
@@ -95,7 +96,6 @@
// switch html/plain mode
function rcmail_toggle_editor(select, textAreaId, flagElement)
{
- var composeElement = document.getElementById(textAreaId);
var flag, ishtml;
if (select.tagName != 'SELECT')
@@ -103,33 +103,21 @@
else
ishtml = select.value == 'html';
- if (ishtml) {
- rcmail.display_spellcheck_controls(false);
+ var res = rcmail.command('toggle-editor', {id:textAreaId, mode:ishtml?'html':'plain'});
- rcmail.plain2html(composeElement.value, textAreaId);
- tinyMCE.execCommand('mceAddControl', false, textAreaId);
+ if (ishtml) {
// #1486593
- setTimeout("rcmail_editor_tabindex();", 500);
+ setTimeout("rcmail_editor_tabindex(true);", 500);
if (flagElement && (flag = rcube_find_object(flagElement)))
flag.value = '1';
}
else {
- var thisMCE = tinyMCE.get(textAreaId);
- var existingHtml = thisMCE.getContent();
-
- if (existingHtml) {
- if (!confirm(rcmail.get_label('editorwarning'))) {
- if (select.tagName == 'SELECT')
- select.value = 'html';
- return false;
- }
-
- rcmail.html2plain(existingHtml, textAreaId);
- }
-
- tinyMCE.execCommand('mceRemoveControl', false, textAreaId);
- rcmail.display_spellcheck_controls(true);
+ if (!res && select.tagName == 'SELECT')
+ select.value = 'html';
if (flagElement && (flag = rcube_find_object(flagElement)))
flag.value = '0';
+
+ if (rcmail.env.composebody)
+ rcube_find_object(rcmail.env.composebody).focus();
}
}
--
Gitblit v1.9.1