From 7f43e18fde11cf30a8b8fbe71ab5e2a0dba823f8 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 05 Dec 2008 02:19:35 -0500
Subject: [PATCH] #1485605: some css fixes for IE6
---
program/js/editor.js | 159 ++++++++++++++++++++++------------------------------
1 files changed, 68 insertions(+), 91 deletions(-)
diff --git a/program/js/editor.js b/program/js/editor.js
index bdb0e19..a3f0d34 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -13,106 +13,83 @@
$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',
+ 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 : '',
+ 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 : '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,
+ rc_client: rcube_webmail_client,
+ oninit : 'rcmail_editor_callback'
+ });
+}
-function rcmail_editor_init(skin_path)
- {
- tinyMCE.init({ mode : "textareas",
- editor_selector : "mce_editor",
- accessibility_focus : false,
- apply_source_formatting : true,
- theme : "advanced",
- plugins : "emotions,media,nonbreaking,table,searchreplace,spellchecker,visualchars",
- 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,undo,redo,image,media,spellchecker",
- 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 : "editor_images.js"
- });
- }
+// 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 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 (toggles[t].value == 'html')
- {
- toggles[t].checked = (htmlFlag.value == "1");
- }
- else
- {
- toggles[t].checked = (htmlFlag.value == "0");
- }
- }
- }
-
-// 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 isHtml = htmlFlag.value;
-
- if (((selectedEditor == 'plain') && (isHtml == "0")) ||
- ((selectedEditor == 'html') && (isHtml == "1")))
- {
- return;
- }
-
- // do the appropriate conversion
-
- var composeElement = document.getElementById('compose-body');
-
- if (selectedEditor == 'html')
+ if (ishtml)
{
var existingPlainText = composeElement.value;
var htmlText = "<pre>" + existingPlainText + "</pre>";
+
+ rcmail.display_spellcheck_controls(false);
composeElement.value = htmlText;
- tinyMCE.execCommand('mceAddControl', true, 'compose-body');
- htmlFlag.value = "1";
+ tinyMCE.execCommand('mceAddControl', true, textAreaId);
+ if (flagElement && (flag = rcube_find_object(flagElement)))
+ flag.value = '1';
}
else
{
- rcmail.set_busy(true, 'converting');
- var thisMCE = tinyMCE.get('compose-body');
+ if (!confirm(rcmail.get_label('editorwarning')))
+ return false;
+
+ var thisMCE = tinyMCE.get(textAreaId);
var existingHtml = thisMCE.getContent();
- rcmail_html2plain(existingHtml);
- tinyMCE.execCommand('mceRemoveControl', true, 'compose-body');
- htmlFlag.value = "0";
+ 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.bin_path+'html2text.php';
- console.log('HTTP request: ' + url);
- 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