CKEDITOR-368: Upgrade to CKEditor 4.15

xwiki-attic · Sep 9, 2020 · db2dc50 · db2dc50
1 parent 7411b4b
commit db2dc50
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/base/src/main/config/build-config.js b/base/src/main/config/build-config.js
@@ -90,14 +90,16 @@ var CKBUILDER_CONFIG = {
     maximize: 1,
     mentions: 1,
     newpage: 0,
-    pagebreak: 0,
     notification: 1,
+    pagebreak: 0,
     pastetools: 1,
+    pastefromlibreoffice: 1,
     pastefromword: 1,
+    pastetext: 1,
     pastefromgdocs: 1,
+    editorplaceholder: 1,
     preview: 0,
     print: 0,
-    pastetext: 1,
     removeformat: 1,
     resize: 1,
     save: 1,

diff --git a/pom.xml b/pom.xml
@@ -47,7 +47,7 @@
     <tag>HEAD</tag>
   </scm>
   <properties>
-    <ckeditor.version>4.14.1</ckeditor.version>
+    <ckeditor.version>4.15.0</ckeditor.version>
     <!-- The path to the folder where we clone the CKEditor sources. -->
     <ckeditor.path>${project.build.directory}/ckeditor4-${ckeditor.version}</ckeditor.path>
     <ckeditor.builder.path>${ckeditor.path}/dev/builder</ckeditor.builder.path>

diff --git a/webjar/src/main/config/build-config.js b/webjar/src/main/config/build-config.js
@@ -91,14 +91,16 @@ var CKBUILDER_CONFIG = {
     maximize: 1,
     mentions: 1,
     newpage: 0,
-    pagebreak: 0,
     notification: 1,
+    pagebreak: 0,
     pastetools: 1,
+    pastefromlibreoffice: 1,
     pastefromword: 1,
+    pastetext: 1,
     pastefromgdocs: 1,
+    editorplaceholder: 1,
     preview: 0,
     print: 0,
-    pastetext: 1,
     removeformat: 1,
     resize: 1,
     save: 1,