From 0bde1c2e4d0872f1acaee4c94b4f7bd38ad354ea Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 08 Jan 2016 04:56:17 -0500
Subject: [PATCH] Fix missing language name in "Add to Dictionary" request in HTML mode (#1490634)
---
program/js/editor.js | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/program/js/editor.js b/program/js/editor.js
index 0ad86bf..200d8c8 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -39,7 +39,7 @@
abs_url = location.href.replace(/[?#].*$/, '').replace(/\/$/, ''),
conf = {
selector: '#' + ($('#' + id).is('.mce_editor') ? id : 'fake-editor-id'),
- cache_suffix: 's=4010900',
+ cache_suffix: 's=4020700',
theme: 'modern',
language: config.lang,
content_css: rcmail.assets_path('program/js/tinymce/roundcube/content.css'),
@@ -71,6 +71,9 @@
tinymce.registered_request_token = true;
tinymce.util.XHR.on('beforeSend', function(e) {
e.xhr.setRequestHeader('X-Roundcube-Request', rcmail.env.request_token);
+ // Fix missing lang parameter on addToDictionary request (#1490634)
+ if (e.settings && e.settings.data && /^method=addToDictionary/.test(e.settings.data) && !/&lang=/.test(e.settings.data))
+ e.settings.data += '&lang=' + ref.editor.plugins.spellchecker.getLanguage();
});
}
@@ -88,11 +91,11 @@
// full-featured editor
else {
$.extend(conf, {
- plugins: 'autolink charmap code colorpicker directionality emoticons link image media nonbreaking'
+ plugins: 'autolink charmap code colorpicker directionality link image media nonbreaking'
+ ' paste table tabfocus textcolor searchreplace spellchecker',
toolbar: 'bold italic underline | alignleft aligncenter alignright alignjustify'
+ ' | bullist numlist outdent indent ltr rtl blockquote | forecolor backcolor | fontselect fontsizeselect'
- + ' | link unlink table | emoticons charmap image media | code searchreplace undo redo',
+ + ' | link unlink table | $extra charmap image media | code searchreplace undo redo',
spellchecker_rpc_url: abs_url + '/?_task=utils&_action=spell_html&_remote=1',
spellchecker_language: rcmail.env.spell_lang,
accessibility_focus: false,
@@ -102,6 +105,16 @@
});
}
+ // add TinyMCE plugins/buttons from Roundcube plugin
+ $.each(config.extra_plugins || [], function() {
+ if (conf.plugins.indexOf(this) < 0)
+ conf.plugins = conf.plugins + ' ' + this;
+ });
+ $.each(config.extra_buttons || [], function() {
+ if (conf.toolbar.indexOf(this) < 0)
+ conf.toolbar = conf.toolbar.replace('$extra', '$extra ' + this);
+ });
+
// disable TinyMCE plugins/buttons from Roundcube plugin
$.each(config.disabled_plugins || [], function() {
conf.plugins = conf.plugins.replace(this, '');
@@ -109,7 +122,8 @@
$.each(config.disabled_buttons || [], function() {
conf.toolbar = conf.toolbar.replace(this, '');
});
- conf.toolbar = conf.toolbar.replace(/\|\s+\|/g, '|');
+
+ conf.toolbar = conf.toolbar.replace('$extra', '').replace(/\|\s+\|/g, '|');
// support external configuration settings e.g. from skin
if (window.rcmail_editor_settings)
@@ -536,20 +550,19 @@
// Append the signature as a div within the body
if (!sigElem) {
- var body = this.editor.getBody(),
- doc = this.editor.getDoc();
+ var body = this.editor.getBody();
- sigElem = doc.createElement('div');
- sigElem.setAttribute('id', '_rc_sig');
+ sigElem = $('<div id="_rc_sig"></div>').get(0);
- if (rcmail.env.top_posting && !rcmail.env.sig_below) {
+ // insert at start or at cursor position in top-posting mode
+ // (but not if the content is empty)
+ if (rcmail.env.top_posting && !rcmail.env.sig_below && (body.childNodes.length > 1 || $(body).text())) {
this.editor.getWin().focus(); // correct focus in IE & Chrome
var node = this.editor.selection.getNode();
- // insert at start or at cursor position if found
- body.insertBefore(sigElem, node.nodeName == 'BODY' ? body.firstChild : node.nextSibling);
- body.insertBefore(doc.createElement('p'), sigElem);
+ $(sigElem).insertBefore(node.nodeName == 'BODY' ? body.firstChild : node.nextSibling);
+ $('<p>').append($('<br>')).insertBefore(sigElem);
}
else {
body.appendChild(sigElem);
--
Gitblit v1.9.1