From d6284b4d22d1e6912b01228b7d2a63e9fecbc5fb Mon Sep 17 00:00:00 2001
From: till <till@php.net>
Date: Wed, 02 Nov 2011 11:13:42 -0400
Subject: [PATCH] check-in 3.4.6 (without moxieplayer due to a content-spoofing vulnerability)
---
program/js/editor.js | 197 ++++++++++++++++++++++++++-----------------------
1 files changed, 105 insertions(+), 92 deletions(-)
diff --git a/program/js/editor.js b/program/js/editor.js
index bdb0e19..63186fb 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, The Roundcube Dev Team |
| Licensed under the GNU GPL |
| |
+-----------------------------------------------------------------------+
@@ -13,106 +13,119 @@
$Id: editor.js 000 2006-05-18 19:12:28Z roundcube $
*/
-// Initialize the message editor
+// Initialize HTML editor
+function rcmail_editor_init(config)
+{
+ var ret, conf = {
+ mode: 'textareas',
+ editor_selector: 'mce_editor',
+ apply_source_formatting: true,
+ theme: 'advanced',
+ language: config.lang,
+ content_css: config.skin_path + '/editor_content.css',
+ theme_advanced_toolbar_location: 'top',
+ theme_advanced_toolbar_align: 'left',
+ theme_advanced_buttons3: '',
+ extended_valid_elements: 'font[face|size|color|style],span[id|class|align|style]',
+ relative_urls: false,
+ remove_script_host: false,
+ gecko_spellcheck: true,
+ convert_urls: false, // #1486944
+ external_image_list_url: 'program/js/editor_images.js',
+ rc_client: rcmail
+ };
-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"
- });
+ if (config.mode == 'identity')
+ $.extend(conf, {
+ plugins: 'paste,tabfocus',
+ 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'
+ });
+ else // mail compose
+ $.extend(conf, {
+ plugins: 'paste,emotions,media,nonbreaking,table,searchreplace,visualchars,directionality,tabfocus' + (config.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,table,|,emotions,charmap,image,media,|,code,search' + (config.spellcheck ? ',spellchecker' : '') + ',undo,redo',
+ 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_html',
+ spellchecker_enable_learn_rpc: config.spelldict,
+ accessibility_focus: false,
+ oninit: 'rcmail_editor_callback'
+ });
+
+ // support external configuration settings e.g. from skin
+ if (window.rcmail_editor_settings)
+ $.extend(conf, window.rcmail_editor_settings);
+
+ tinyMCE.init(conf);
+}
+
+// react to real individual tinyMCE editor init
+function rcmail_editor_callback()
+{
+ var elem = rcube_find_object('_from'),
+ fe = rcmail.env.compose_focus_elem;
+
+ if (elem && elem.type == 'select-one') {
+ rcmail.change_identity(elem);
+ // Focus previously focused element
+ if (fe && fe.id != rcmail.env.composebody) {
+ window.focus(); // for WebKit (#1486674)
+ fe.focus();
+ }
}
-// 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 tabIndex and set focus to element that was focused before
+ rcmail_editor_tabindex(fe && fe.id == rcmail.env.composebody);
+ // Trigger resize (needed for proper editor resizing in some browsers using default skin)
+ $(window).resize();
+}
- 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");
- }
- }
+// set tabIndex on tinyMCE editor
+function rcmail_editor_tabindex(focus)
+{
+ if (rcmail.env.task == 'mail') {
+ var editor = tinyMCE.get(rcmail.env.composebody);
+ if (editor) {
+ var textarea = editor.getElement();
+ var node = editor.getContentAreaContainer().childNodes[0];
+ if (textarea && node)
+ node.tabIndex = textarea.tabIndex;
+ if (focus)
+ editor.getWin().focus();
+ }
}
+}
-// Toggle between the HTML and Plain Text editors
+// switch html/plain mode
+function rcmail_toggle_editor(select, textAreaId, flagElement)
+{
+ var flag, ishtml;
-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')
- {
- var existingPlainText = composeElement.value;
- var htmlText = "<pre>" + existingPlainText + "</pre>";
- composeElement.value = htmlText;
- tinyMCE.execCommand('mceAddControl', true, 'compose-body');
- htmlFlag.value = "1";
- }
+ if (select.tagName != 'SELECT')
+ ishtml = select.checked;
else
- {
- rcmail.set_busy(true, 'converting');
- var thisMCE = tinyMCE.get('compose-body');
- var existingHtml = thisMCE.getContent();
- rcmail_html2plain(existingHtml);
- tinyMCE.execCommand('mceRemoveControl', true, 'compose-body');
- htmlFlag.value = "0";
- }
- }
+ ishtml = select.value == 'html';
-function rcmail_html2plain(htmlText)
- {
- var http_request = new rcube_http_request();
+ var res = rcmail.command('toggle-editor', {id:textAreaId, mode:ishtml?'html':'plain'});
- 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');
+ if (ishtml) {
+ // #1486593
+ setTimeout("rcmail_editor_tabindex(true);", 500);
+ if (flagElement && (flag = rcube_find_object(flagElement)))
+ flag.value = '1';
}
+ else if (res) {
+ if (flagElement && (flag = rcube_find_object(flagElement)))
+ flag.value = '0';
-function rcmail_set_text_value(httpRequest)
- {
- rcmail.set_busy(false);
- var composeElement = document.getElementById('compose-body');
- composeElement.value = httpRequest.get_text();
+ if (rcmail.env.composebody)
+ rcube_find_object(rcmail.env.composebody).focus();
}
-
-function rcmail_handle_toggle_error(httpRequest)
- {
- alert('html2text request returned with error ' + httpRequest.xmlhttp.status);
+ else { // !res
+ if (select.tagName == 'SELECT')
+ select.value = 'html';
+ else if (select.tagName == 'INPUT')
+ select.checked = true;
}
+}
--
Gitblit v1.9.1