Commit 2c8b82c6 authored by Raphael Mäder's avatar Raphael Mäder
Browse files

Merge branch 'bugfix/RASCHSLA-1897' into '2.5.x'

RASCHSLA-1887 Enable Paste plugin for tinymce-default

See merge request !398
parents df0b0493 097e614f
Pipeline #19164 failed with stages
in 25 minutes and 16 seconds
......@@ -83,7 +83,7 @@ jsconfig = {
toolbar: "undo redo | styleselect | bold italic | " + dynamics.tinyMce.optionalPlugins.jbimages.toolbar1 + " | code | bullist | forecolor backcolor | codesample"
},
defaultLayout: {
plugins: 'compat3x advlist anchor autolink charmap code codesample colorpicker contextmenu directionality fullscreen help hr image imagetools insertdatetime link lists media nonbreaking pagebreak print searchreplace table template textcolor textpattern toc visualblocks visualchars wordcount',
plugins: 'compat3x advlist anchor autolink charmap code codesample colorpicker contextmenu directionality fullscreen help hr image imagetools insertdatetime link lists media nonbreaking pagebreak paste print searchreplace table template textcolor textpattern toc visualblocks visualchars wordcount',
toolbar: ['newdocument undo redo | styleselect | bold italic underline subscript superscript strikethrough codesample forecolor backcolor removeformat | alignleft aligncenter alignright alignjustify | bullist numlist indent outdent table | link image media | code'],
table_default_attributes: {
class: 'table table-bordered'
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment