ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3375 from emanuelschuetze/ckeditor

Browse Source 
Updated to ckeditor 4.7.2
This commit is contained in:
Emanuel Schütze 2017-08-29 11:36:58 +02:00 committed by GitHub
commit 0dda74b99b
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -70,6 +70,7 @@ Core:
- Added default sorting for agenda, motions, elections, mediafiles and - Added default sorting for agenda, motions, elections, mediafiles and
users [#3334, 3348]. users [#3334, 3348].
- Added config for disabling header and footer in the projector [#3357]. - Added config for disabling header and footer in the projector [#3357].
- Updated CKEditor to 4.7 [#3375].
- Reduced ckeditor toolbar for inline editing [#3368]. - Reduced ckeditor toolbar for inline editing [#3368].
Mediafiles: Mediafiles:

2
bower.json
View File

@ -23,7 +23,7 @@
"angularjs-slider": "~6.2.2", "angularjs-slider": "~6.2.2",
"bootstrap-css-only": "~3.3.6", "bootstrap-css-only": "~3.3.6",
"bootstrap-ui-datetime-picker": "~2.4.0", "bootstrap-ui-datetime-picker": "~2.4.0",
"ckeditor": "4.6.1", "ckeditor": "~4.7.2",
"docxtemplater": "~2.1.5", "docxtemplater": "~2.1.5",
"font-awesome-bower": "~4.5.0", "font-awesome-bower": "~4.5.0",
"jquery.cookie": "~1.4.1", "jquery.cookie": "~1.4.1",

1
gulpfile.js
View File

@ -168,7 +168,6 @@ gulp.task('ckeditor-plugins', function () {
path.join('bower_components', 'ckeditor', 'plugins', 'specialchar', '**', '*'), path.join('bower_components', 'ckeditor', 'plugins', 'specialchar', '**', '*'),
path.join('bower_components', 'ckeditor', 'plugins', 'sourcedialog', '**', '*'), path.join('bower_components', 'ckeditor', 'plugins', 'sourcedialog', '**', '*'),
path.join('bower_components', 'ckeditor', 'plugins', 'table', '**', '*'), path.join('bower_components', 'ckeditor', 'plugins', 'table', '**', '*'),
path.join('bower_components', 'ckeditor', 'plugins', 'tabeltools', '**', '*'),
], ],
{ {
base: path.join('bower_components', 'ckeditor', 'plugins') base: path.join('bower_components', 'ckeditor', 'plugins')

2
openslides/core/static/js/core/base.js
View File

@ -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. // there seems to be an error in CKeditor that parses spaces in extraPlugins as part of the plugin name.
extraPlugins: extraPluginsString, 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', removeButtons: 'Scayt,Anchor,Styles,HorizontalRule',
}; };
if (_.indexOf(arguments, 'inline') > -1) { if (_.indexOf(arguments, 'inline') > -1) {