From 4af76d20cafcd456bf3ce0fcb17b25a888c45160 Mon Sep 17 00:00:00 2001
From: Thomas <thomas@roundcube.net>
Date: Mon, 21 Oct 2013 15:14:46 -0400
Subject: [PATCH] Bump version
---
program/js/editor.js | 120 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 77 insertions(+), 43 deletions(-)
diff --git a/program/js/editor.js b/program/js/editor.js
index 3845e3d..bc36e9a 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -3,63 +3,72 @@
| Roundcube editor js library |
| |
| This file is part of the Roundcube web development suite |
- | Copyright (C) 2006, Roundcube Dev, - Switzerland |
- | Licensed under the GNU GPL |
+ | Copyright (C) 2006-2012, The Roundcube Dev Team |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
| Author: Eric Stadtherr <estadtherr@gmail.com> |
+-----------------------------------------------------------------------+
-
- $Id: editor.js 000 2006-05-18 19:12:28Z roundcube $
*/
// Initialize HTML editor
-function rcmail_editor_init(skin_path, editor_lang, spellcheck, mode)
+function rcmail_editor_init(config)
{
- if (mode == 'identity')
- tinyMCE.init({
+ var ret, conf = {
mode: 'textareas',
editor_selector: 'mce_editor',
apply_source_formatting: true,
theme: 'advanced',
- language: editor_lang,
- content_css: skin_path + '/editor_content.css',
- plugins: 'paste,tabfocus',
+ language: config.lang,
+ content_css: config.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: '',
- 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,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: '',
- theme_advanced_toolbar_location: 'top',
- theme_advanced_toolbar_align: 'left',
+ theme_advanced_statusbar_location: 'none',
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'),
- spellchecker_rpc_url: '?_task=utils&_action=spell&tiny=1',
- gecko_spellcheck: true,
- remove_script_host: false,
relative_urls: false,
+ remove_script_host: false,
+ gecko_spellcheck: true,
convert_urls: false, // #1486944
- rc_client: rcmail,
+ external_image_list: window.rcmail_editor_images,
+ rc_client: rcmail
+ };
+
+ 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,inlinepopups,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,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&_remote=1',
+ spellchecker_enable_learn_rpc: config.spelldict,
+ accessibility_focus: false,
oninit: 'rcmail_editor_callback'
});
+
+ // add handler for spellcheck button state update
+ conf.setup = function(ed) {
+ ed.onSetProgressState.add(function(ed, active) {
+ if (!active)
+ rcmail.spellcheck_state();
+ });
+ }
+ }
+
+ // 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
@@ -68,12 +77,18 @@
var elem = rcube_find_object('_from'),
fe = rcmail.env.compose_focus_elem;
+ if (rcmail.env.default_font)
+ $(tinyMCE.get(rcmail.env.composebody).getBody()).css('font-family', rcmail.env.default_font);
+
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();
+ // use setTimeout() for IE9 (#1488541)
+ window.setTimeout(function() {
+ window.focus(); // for WebKit (#1486674)
+ fe.focus();
+ }, 10);
}
}
@@ -94,7 +109,7 @@
if (textarea && node)
node.tabIndex = textarea.tabIndex;
if (focus)
- editor.getWin().focus();
+ editor.getBody().focus();
}
}
}
@@ -117,13 +132,32 @@
if (flagElement && (flag = rcube_find_object(flagElement)))
flag.value = '1';
}
- else {
- if (!res && select.tagName == 'SELECT')
- select.value = 'html';
+ else if (res) {
if (flagElement && (flag = rcube_find_object(flagElement)))
flag.value = '0';
if (rcmail.env.composebody)
rcube_find_object(rcmail.env.composebody).focus();
}
+ else { // !res
+ if (select.tagName == 'SELECT')
+ select.value = 'html';
+ else if (select.tagName == 'INPUT')
+ select.checked = true;
+ }
}
+
+// editor callbeck for images listing
+function rcmail_editor_images()
+{
+ var i, files = rcmail.env.attachments, list = [];
+
+ for (i in files) {
+ att = files[i];
+ if (att.complete && att.mimetype.indexOf('image/') == 0) {
+ list.push([att.name, rcmail.env.comm_path+'&_action=display-attachment&_file='+i+'&_id='+rcmail.env.compose_id]);
+ }
+ }
+
+ return list;
+};
--
Gitblit v1.9.1