diff options
author | Aleksander Machniak <alec@alec.pl> | 2014-06-18 20:44:19 +0200 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2014-06-18 20:44:19 +0200 |
commit | 3e7536d653cb76351c60c3e40699612d618f1dc8 (patch) | |
tree | 4ab9ae7406dcbf4293347b7ccf8dc199b19e1402 /program/js/editor.js | |
parent | d9e541c5fecfbaba784596ab0e345bfc3063d13e (diff) |
Upgrade to TinyMCE 4.1.0
Diffstat (limited to 'program/js/editor.js')
-rw-r--r-- | program/js/editor.js | 6 |
1 files changed, 3 insertions, 3 deletions
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', |