diff --git a/mir-module/GruntFile.js b/mir-module/GruntFile.js index cea4ec2c9c..e56b9d0bc1 100644 --- a/mir-module/GruntFile.js +++ b/mir-module/GruntFile.js @@ -20,9 +20,9 @@ module.exports = function(grunt) { }, files : { 'bootstrap/js' : 'bootstrap/dist/js', - 'ckeditor4' : 'ckeditor4/', - 'ckeditor4/plugins/notification/' : 'ckeditor-notification-plugin', - 'ckeditor4/plugins/wordcount/' : 'ckeditor-wordcount-plugin/wordcount', + + 'tinymce' : 'tinymce', + 'tinymce/langs' : 'tinymce-i18n/langs7', 'font-awesome/css' : '@fortawesome/fontawesome-free/css', 'font-awesome/webfonts' : '@fortawesome/fontawesome-free/webfonts', @@ -78,19 +78,18 @@ module.exports = function(grunt) { '<%= globalConfig.moduleDirectory %>/target/classes/META-INF/resources/js/jquery.search-entity.min.js': '<%= globalConfig.moduleDirectory %>/src/main/resources/META-INF/resources/js/jquery.search-entity.js', '<%= globalConfig.moduleDirectory %>/target/classes/META-INF/resources/js/epusta.min.js': '<%= globalConfig.moduleDirectory %>/src/main/resources/META-INF/resources/js/epusta.js', - '<%= globalConfig.moduleDirectory %>/target/classes/META-INF/assets/ckeditor4/config.min.js': '<%= globalConfig.moduleDirectory %>/src/main/resources/META-INF/resources/js/ckeditor-config.js' } } }, }); grunt.registerTask('copy', function() { - const source = getAbsoluteDir(grunt.option('moduleDirectory'))+'/src/main/resources/META-INF/resources/js/ckeditor-config.js'; - const target = getAbsoluteDir(grunt.option('assetsDirectory')) + '/ckeditor4/config.js'; + const source = getAbsoluteDir(grunt.option('moduleDirectory'))+'/src/main/resources/META-INF/resources/js/tinymce-config.js'; + const target = getAbsoluteDir(grunt.option('assetsDirectory')) + '/tinymce/config.js'; fs.copyFile(source, target, (err) => { if (err) { throw err; } - grunt.log('ckeditor config copied!'); + grunt.log('tinymce config copied!'); }); }); grunt.registerTask('none', function() { diff --git a/mir-module/package.json b/mir-module/package.json index a5a3d4036c..cab4706538 100644 --- a/mir-module/package.json +++ b/mir-module/package.json @@ -33,9 +33,8 @@ "video.js": "7.14.3" }, "dependencies": { - "ckeditor-notification": "^4.11.2", - "ckeditor-wordcount-plugin": "^1.17.12", - "ckeditor4": "~4.22.0", + "tinymce": "^7.6.0", + "tinymce-i18n": "^24.12.9", "vue": "3.2.13", "vue3-openlayers": "^1.0.0" } diff --git a/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed b/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed index b2ce523933..0de6bdd59a 100644 --- a/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed +++ b/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed @@ -2321,7 +2321,8 @@ src="{$WebApplicationBaseURL}assets/bootstrap-datepicker/locales/bootstrap-datepicker.de.min.js"> - + +