From 58fb6502e3550e59afa8799d36dfce61a18f8b1b Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 15 Dec 2009 03:48:45 -0500
Subject: [PATCH] - Updated TinyMCE to 3.2.7
---
program/js/editor.js | 180 +++++++++++++++++++++++++++++------------------------------
1 files changed, 89 insertions(+), 91 deletions(-)
diff --git a/program/js/editor.js b/program/js/editor.js
index 3a191b5..361741e 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -13,104 +13,102 @@
$Id: editor.js 000 2006-05-18 19:12:28Z roundcube $
*/
-// Initialize the message editor
+// Initialize HTML editor
+function rcmail_editor_init(skin_path, editor_lang, spellcheck, mode)
+{
+ if (mode == 'identity')
+ tinyMCE.init({
+ mode : 'textareas',
+ editor_selector : 'mce_editor',
+ apply_source_formatting : true,
+ theme : 'advanced',
+ language : editor_lang,
+ content_css : skin_path + '/editor_content.css',
+ plugins: 'paste',
+ 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',
+ theme_advanced_buttons2 : ',fontselect,fontsizeselect',
+ theme_advanced_buttons3 : '',
+ relative_urls : false,
+ remove_script_host : false,
+ gecko_spellcheck : true
+ });
+ else // mail compose
+ tinyMCE.init({
+ mode : 'textareas',
+ editor_selector : 'mce_editor',
+ accessibility_focus : false,
+ apply_source_formatting : true,
+ theme : 'advanced',
+ language : editor_lang,
+ plugins : 'paste,emotions,media,nonbreaking,table,searchreplace,visualchars,directionality' + (spellcheck ? ',spellchecker' : ''),
+ theme_advanced_buttons1 : 'bold,italic,underline,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,bullist,numlist,outdent,indent,separator,link,unlink,emotions,charmap,code,forecolor,backcolor,fontselect,fontsizeselect, separator' + (spellcheck ? ',spellchecker' : '') + ',undo,redo,image,media,ltr,rtl',
+ theme_advanced_buttons2 : '',
+ theme_advanced_buttons3 : '',
+ theme_advanced_toolbar_location : 'top',
+ theme_advanced_toolbar_align : 'left',
+ extended_valid_elements : 'font[face|size|color|style],span[id|class|align|style]',
+ content_css : skin_path + '/editor_content.css',
+ external_image_list_url : 'program/js/editor_images.js',
+ 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'),
+ gecko_spellcheck : true,
+ relative_urls : false,
+ remove_script_host : false,
+ rc_client: rcmail,
+ oninit : 'rcmail_editor_callback'
+ });
+}
-function rcmail_editor_init(skin_path)
- {
- tinyMCE.init({ mode : 'specific_textareas',
- accessibility_focus : false,
- apply_source_formatting : true,
- theme : 'advanced',
- plugins : 'emotions,media,nonbreaking,table,searchreplace,spellchecker,visualchars',
- theme_advanced_buttons1 : 'bold,italic,underline,strikethrough,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,bullist,numlist,outdent,indent,separator,link,unlink,emotions,forecolor,backcolor,formatselect,fontselect,fontsizeselect',
- theme_advanced_buttons2 : 'undo,redo,image,media,hr,charmap,code,nonbreaking,visualchars,separator,search,replace,spellchecker,separator,tablecontrols',
- theme_advanced_buttons3 : '',
- theme_advanced_toolbar_location : 'top',
- theme_advanced_toolbar_align : 'left',
- extended_valid_elements : 'font[face|size|color|style],span[id|class|align|style]',
- content_css : skin_path + '/editor_content.css',
- popups_css : skin_path + '/editor_popup.css',
- editor_css : skin_path + '/editor_ui.css'
- });
+// react to real individual tinyMCE editor init
+function rcmail_editor_callback(editor)
+{
+ var input_from = rcube_find_object('_from');
+ if (input_from && input_from.type=='select-one')
+ rcmail.change_identity(input_from);
+ // set tabIndex
+ rcmail_editor_tabindex();
+}
+
+// set tabIndex on tinyMCE editor
+function rcmail_editor_tabindex()
+{
+ if (rcmail.env.task == 'mail') {
+ var editor = tinyMCE.get(rcmail.env.composebody);
+ var textarea = editor.getElement();
+ var node = editor.getContentAreaContainer().childNodes[0];
+ if (textarea && node)
+ node.tabIndex = textarea.tabIndex;
}
+}
-// Set the state of the HTML/Plain toggles based on the _is_html field value
-function rcmail_set_editor_toggle_states()
- {
- // set the editor toggle based on the state of the editor
+// switch html/plain mode
+function rcmail_toggle_editor(ishtml, textAreaId, flagElement)
+{
+ var composeElement = document.getElementById(textAreaId);
+ var flag;
- var htmlFlag = document.getElementsByName('_is_html')[0];
- var toggles = document.getElementsByName('_editorSelect');
- for(var t=0; t<toggles.length; t++)
+ if (ishtml)
{
- if (toggles[t].value == 'html')
- {
- toggles[t].checked = (htmlFlag.value == "1");
- }
- else
- {
- toggles[t].checked = (htmlFlag.value == "0");
- }
- }
- }
+ rcmail.display_spellcheck_controls(false);
-// Toggle between the HTML and Plain Text editors
-
-function rcmail_toggle_editor(toggler)
- {
- var selectedEditor = toggler.value;
-
- // determine the currently displayed editor
-
- var htmlFlag = document.getElementsByName('_is_html')[0];
- var currentEditor = htmlFlag.value;
-
- if (selectedEditor == currentEditor)
- {
- return;
- }
-
- // do the appropriate conversion
-
- var composeElement = document.getElementById('compose-body');
-
- if (selectedEditor == 'html')
- {
- var existingPlainText = composeElement.value;
- var htmlText = "<pre>" + existingPlainText + "</pre>";
- composeElement.value = htmlText;
- tinyMCE.execCommand('mceAddControl', true, '_message');
- htmlFlag.value = "1";
+ rcmail.plain2html(composeElement.value, textAreaId);
+ tinyMCE.execCommand('mceAddControl', true, textAreaId);
+ rcmail_editor_tabindex();
+ if (flagElement && (flag = rcube_find_object(flagElement)))
+ flag.value = '1';
}
else
{
- rcmail.set_busy(true, 'converting');
- var thisMCE = tinyMCE.getInstanceById('_message');
- var existingHtml = tinyMCE.getContent();
- rcmail_html2plain(existingHtml);
- tinyMCE.execCommand('mceRemoveControl', true, '_message');
- htmlFlag.value = "0";
+ if (!confirm(rcmail.get_label('editorwarning')))
+ return false;
+
+ var thisMCE = tinyMCE.get(textAreaId);
+ var existingHtml = thisMCE.getContent();
+ rcmail.html2plain(existingHtml, textAreaId);
+ tinyMCE.execCommand('mceRemoveControl', true, textAreaId);
+ rcmail.display_spellcheck_controls(true);
+ if (flagElement && (flag = rcube_find_object(flagElement)))
+ flag.value = '0';
}
- }
-
-function rcmail_html2plain(htmlText)
- {
- var http_request = new rcube_http_request();
-
- http_request.onerror = function(o) { rcmail_handle_toggle_error(o); };
- http_request.oncomplete = function(o) { rcmail_set_text_value(o); };
- var url=rcmail.env.comm_path+'&_action=html2text';
- http_request.POST(url, htmlText, 'application/octet-stream');
- }
-
-function rcmail_set_text_value(httpRequest)
- {
- rcmail.set_busy(false);
- var composeElement = document.getElementById('compose-body');
- composeElement.value = httpRequest.get_text();
- }
-
-function rcmail_handle_toggle_error(httpRequest)
- {
- alert('html2text request returned with error ' + httpRequest.xmlhttp.status);
- }
+};
--
Gitblit v1.9.1