From 3e7536d653cb76351c60c3e40699612d618f1dc8 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 18 Jun 2014 20:44:19 +0200 Subject: Upgrade to TinyMCE 4.1.0 --- program/js/editor.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'program/js/editor.js') diff --git a/program/js/editor.js b/program/js/editor.js index 3b0621f55..c5680ed90 100644 --- a/program/js/editor.js +++ b/program/js/editor.js @@ -65,7 +65,7 @@ function rcube_text_editor(config, id) // minimal editor if (config.mode == 'identity') { $.extend(conf, { - plugins: ['autolink charmap code hr link paste tabfocus textcolor'], + plugins: 'autolink charmap code colorpicker hr link paste tabfocus textcolor', toolbar: 'bold italic underline alignleft aligncenter alignright alignjustify' + ' | outdent indent charmap hr link unlink code forecolor' + ' | fontselect fontsizeselect' @@ -74,8 +74,8 @@ function rcube_text_editor(config, id) // full-featured editor else { $.extend(conf, { - plugins: ['autolink charmap code directionality emoticons link image media nonbreaking' - + ' paste table tabfocus textcolor searchreplace' + (config.spellcheck ? ' spellchecker' : '')], + plugins: 'autolink charmap code colorpicker directionality emoticons link image media nonbreaking' + + ' paste table tabfocus textcolor searchreplace' + (config.spellcheck ? ' 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', -- cgit v1.2.3