diff --git a/CHANGELOG b/CHANGELOG index d4ba68a52..2f6a2f91b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -70,6 +70,7 @@ Core: - Added default sorting for agenda, motions, elections, mediafiles and users [#3334, 3348]. - Added config for disabling header and footer in the projector [#3357]. +- Updated CKEditor to 4.7 [#3375]. - Reduced ckeditor toolbar for inline editing [#3368]. Mediafiles: diff --git a/bower.json b/bower.json index 71927d95f..51e1271e9 100644 --- a/bower.json +++ b/bower.json @@ -23,7 +23,7 @@ "angularjs-slider": "~6.2.2", "bootstrap-css-only": "~3.3.6", "bootstrap-ui-datetime-picker": "~2.4.0", - "ckeditor": "4.6.1", + "ckeditor": "~4.7.2", "docxtemplater": "~2.1.5", "font-awesome-bower": "~4.5.0", "jquery.cookie": "~1.4.1", diff --git a/gulpfile.js b/gulpfile.js index aca7f2586..a34546e43 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -168,7 +168,6 @@ gulp.task('ckeditor-plugins', function () { path.join('bower_components', 'ckeditor', 'plugins', 'specialchar', '**', '*'), path.join('bower_components', 'ckeditor', 'plugins', 'sourcedialog', '**', '*'), path.join('bower_components', 'ckeditor', 'plugins', 'table', '**', '*'), - path.join('bower_components', 'ckeditor', 'plugins', 'tabeltools', '**', '*'), ], { base: path.join('bower_components', 'ckeditor', 'plugins') diff --git a/openslides/core/static/js/core/base.js b/openslides/core/static/js/core/base.js index cfeb467cf..21f1fe45c 100644 --- a/openslides/core/static/js/core/base.js +++ b/openslides/core/static/js/core/base.js @@ -976,7 +976,7 @@ angular.module('OpenSlidesApp.core', [ // there seems to be an error in CKeditor that parses spaces in extraPlugins as part of the plugin name. extraPlugins: extraPluginsString, - removePlugins: 'wsc,scayt,a11yhelp,filebrowser,sourcearea,liststyle,tabletools,contextmenu,image', + removePlugins: 'wsc,scayt,a11yhelp,filebrowser,sourcearea,liststyle,tabletools,tableselection,contextmenu,image', removeButtons: 'Scayt,Anchor,Styles,HorizontalRule', }; if (_.indexOf(arguments, 'inline') > -1) {