From 5b3a86da57a47a723f89d8dd64ce484002b8e4bb Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 09 May 2016 03:52:57 -0400
Subject: [PATCH] Merge pull request #5184 from guitarmanusa/compose_focus
---
program/js/editor.js | 58 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/program/js/editor.js b/program/js/editor.js
index 2415b7a..1702e21 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,14 +105,25 @@
});
}
+ // 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, '');
});
- $.each(config.disabled_plugins || [], function() {
+ $.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)
@@ -436,7 +450,6 @@
// get selected text from tinymce editor
if (ed) {
- ed.getWin().focus(); // correct focus in IE & Chrome
if (args.selection)
text = ed.selection.getContent({format: args.format});
@@ -499,10 +512,10 @@
message = message.substring(0, p) + sig + message.substring(p, message.length);
cursor_pos = p - 1;
}
- // empty message
- else if (!message) {
- message = '\n\n' + sig;
- cursor_pos = 0;
+ // empty message or new-message mode
+ else if (!message || !rcmail.env.compose_mode) {
+ cursor_pos = message.length;
+ message += '\n\n' + sig;
}
else if (rcmail.env.top_posting && !rcmail.env.sig_below) {
// at cursor position
@@ -536,24 +549,25 @@
// 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 and not in new-message mode)
+ if (rcmail.env.top_posting && !rcmail.env.sig_below
+ && rcmail.env.compose_mode && (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);
- position_element = rcmail.env.top_posting ? body.firstChild : $(sigElem).prev();
+ position_element = rcmail.env.top_posting && rcmail.env.compose_mode ? body.firstChild : $(sigElem).prev();
}
}
@@ -591,7 +605,7 @@
// open image selector dialog
dialog = this.editor.windowManager.open({
- title: rcmail.gettext('select' + type),
+ title: rcmail.get_label('select' + type),
width: 500,
height: 300,
html: '<div id="image-selector-list"><ul></ul></div>'
@@ -618,7 +632,7 @@
.text($('div.hint', rcmail.gui_objects.uploadform).text()));
// init upload button
- elem = $('#image-upload-button').append($('<span>').text(rcmail.gettext('add' + type)));
+ elem = $('#image-upload-button').append($('<span>').text(rcmail.get_label('add' + type)));
cancel = elem.parents('.mce-panel').find('button:last').parent();
// we need custom Tab key handlers, until we find out why
@@ -661,7 +675,7 @@
rcmail.gui_objects.filedrop = $('#image-selector-form');
rcmail.gui_objects.filedrop.addClass('droptarget')
- .bind('dragover dragleave', function(e) {
+ .on('dragover dragleave', function(e) {
e.preventDefault();
e.stopPropagation();
$(this)[(e.type == 'dragover' ? 'addClass' : 'removeClass')]('hover');
--
Gitblit v1.9.1