src/pyams_skin/resources/js/myams.js
changeset 313 d2676eff7f10
parent 311 8998faf1ef23
child 314 4caa856eb517
--- a/src/pyams_skin/resources/js/myams.js	Fri Apr 13 12:07:28 2018 +0200
+++ b/src/pyams_skin/resources/js/myams.js	Thu Apr 26 14:38:35 2018 +0200
@@ -4361,11 +4361,11 @@
 														"emoticons paste textcolor colorpicker textpattern autoresize"
 													],
 													toolbar: data.amsTinymceToolbar,
-													toolbar1: data.amsTinymceToolbar1 === false ? false :
+													toolbar1: data.amsTinymceToolbar1 === false ? false : data.amsTinymceToolbar1 ||
 														"undo redo | styleselect | bold italic | alignleft " +
 														"aligncenter alignright alignjustify | bullist numlist " +
 														"outdent indent",
-													toolbar2: data.amsTinymceToolbar2 === false ? false :
+													toolbar2: data.amsTinymceToolbar2 === false ? false : data.amsTinymceToolbar2 ||
 														"forecolor backcolor emoticons | charmap link image media | " +
 														"fullscreen preview print | code",
 													content_css: data.amsTinymceContentCss,