From 2aa9ee56fd8f4e36c9d5c65cf1b7dc15def11f82 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 27 Oct 2015 12:18:23 -0400
Subject: [PATCH] Fix so disabling emoticons plugin really removes emoticons button from HTML editor
---
program/js/editor.js | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/program/js/editor.js b/program/js/editor.js
index abd800c..50ba03d 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'),
@@ -88,11 +88,11 @@
// full-featured editor
else {
$.extend(conf, {
- plugins: 'autolink charmap code colorpicker directionality emoticons link image media nonbreaking'
- + ' paste table tabfocus textcolor searchreplace' + (config.spellcheck ? ' spellchecker' : ''),
+ 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,
@@ -101,6 +101,26 @@
file_browser_callback_types: 'image media'
});
}
+
+ // 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_buttons || [], function() {
+ conf.toolbar = conf.toolbar.replace(this, '');
+ });
+
+ conf.toolbar = conf.toolbar.replace('$extra', '').replace(/\|\s+\|/g, '|');
// support external configuration settings e.g. from skin
if (window.rcmail_editor_settings)
@@ -548,9 +568,7 @@
}
}
- if (rcmail.env.signatures[id]) {
- sigElem.innerHTML = rcmail.env.signatures[id].html;
- }
+ sigElem.innerHTML = rcmail.env.signatures[id] ? rcmail.env.signatures[id].html : '';
}
else if (!rcmail.env.top_posting) {
position_element = $(this.editor.getBody()).children().last();
@@ -584,7 +602,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>'
@@ -611,7 +629,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
@@ -654,7 +672,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