Merge pull request #2578 from emanuelschuetze/fix-2115

Allow to resize tinymce editor (Fixes #2115)
This commit is contained in:
Norman Jäckel 2016-11-02 13:30:49 +01:00 committed by GitHub
commit 8ec6681e81

View File

@ -419,13 +419,12 @@ angular.module('OpenSlidesApp.core.site', [
theme_url: '/static/js/openslides-libs.js', theme_url: '/static/js/openslides-libs.js',
skin_url: '/static/tinymce/skins/lightgray/', skin_url: '/static/tinymce/skins/lightgray/',
inline: inlineMode, inline: inlineMode,
statusbar: false,
browser_spellcheck: true, browser_spellcheck: true,
image_advtab: true, image_advtab: true,
image_list: images, image_list: images,
plugins: [ plugins: [
'lists link autolink charmap preview searchreplace code fullscreen', 'lists link autolink charmap preview searchreplace code fullscreen',
'paste textcolor colorpicker image imagetools' 'paste textcolor colorpicker image imagetools wordcount'
], ],
menubar: '', menubar: '',
toolbar: 'undo redo searchreplace | styleselect | bold italic underline strikethrough ' + toolbar: 'undo redo searchreplace | styleselect | bold italic underline strikethrough ' +