From 2c633703e97eb6e7aa7ba840ef86b1fc1bd98ada Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Wed, 23 May 2007 23:49:19 -0400
Subject: [PATCH] upgrade to TinyMCE v2.1.1.1
---
program/js/editor.js | 187 +++++++++++++++++++---------------------------
1 files changed, 78 insertions(+), 109 deletions(-)
diff --git a/program/js/editor.js b/program/js/editor.js
index 536ad2a..536762e 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -9,140 +9,109 @@
+-----------------------------------------------------------------------+
| Author: Eric Stadtherr <estadtherr@gmail.com> |
+-----------------------------------------------------------------------+
-
+
$Id: editor.js 000 2006-05-18 19:12:28Z roundcube $
*/
// Initialize the message editor
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,separator,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,separator,bullist,numlist,outdent,indent,separator,forecolor,backcolor,formatselect,fontselect,fontsizeselect',
- theme_advanced_buttons2 : 'undo,redo,image,media,hr,link,unlink,emotions,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'
- });
-}
+ {
+ 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'
+ });
+ }
// 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
+ {
+ // set the editor toggle based on the state of the editor
- 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");
- }
+ 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;
+ {
+ var selectedEditor = toggler.value;
- // determine the currently displayed editor
+ // determine the currently displayed editor
- var htmlFlag = document.getElementsByName('_is_html')[0];
- var currentEditor = htmlFlag.value;
+ var htmlFlag = document.getElementsByName('_is_html')[0];
+ var currentEditor = htmlFlag.value;
- if (selectedEditor == currentEditor)
- {
- return;
- }
+ if (selectedEditor == currentEditor)
+ {
+ return;
+ }
- // do the appropriate conversion
+ // do the appropriate conversion
- var composeElement = document.getElementById('compose-body');
+ 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";
- }
- 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 (selectedEditor == 'html')
+ {
+ var existingPlainText = composeElement.value;
+ var htmlText = "<pre>" + existingPlainText + "</pre>";
+ composeElement.value = htmlText;
+ tinyMCE.execCommand('mceAddControl', true, '_message');
+ htmlFlag.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";
+ }
+ }
function rcmail_html2plain(htmlText)
-{
- var http_request = new rcube_http_request();
+ {
+ 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 old_html2Plain(htmlText)
-{
- var http_request = false;
- if (window.XMLHttpRequest)
- {
- http_request = new XMLHttpRequest();
- //http_request.overrideMimeType('text/plain');
- }
-
- if (http_request)
- {
- rcmail.set_busy(true);
-
- http_request.onreadystatechange = function()
- { setTextValue(http_request); };
- //var url = window.location.protocol + '://' +
- //window.location.host + window.location.pathname +
- //'conv_html.php';
-
- var url = 'conv_html.php';
- //alert('calling ' + url);
- var reqbody = 'htmlText=' + htmlText;
- http_request.open('POST', url, true);
- http_request.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
- http_request.send(reqbody);
- }
-}
-
-*/
+ 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';
+ console('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();
-}
+ {
+ 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);
-}
+ {
+ alert('html2text request returned with error ' + httpRequest.xmlhttp.status);
+ }
--
Gitblit v1.9.1