SAK-34036 - Update CKEditor to 4.9.1 and update all plugins (sakaipro…

…ject#5435) * SAK-34036 - Update CKEditor to 4.9.0 and update all plugins * SAK-34036 - Update elfinder to 2.1.28 * SAK-34036 - Update CKEditor to 4.9.1
rifqioe · Mar 31, 2018 · dc170b1 · dc170b1
1 parent 4a3b3ee
commit dc170b1
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/library/pom.xml b/library/pom.xml
@@ -14,7 +14,7 @@
 	<packaging>war</packaging>
 	<properties>
 		<!-- This is used in re-write rules as well -->
-		<ckeditor.version>4.8.0</ckeditor.version>
+		<ckeditor.version>4.9.1</ckeditor.version>
 		<bootstrap-version>3.3.7</bootstrap-version>
 		<font-awesome-version>4.7.0</font-awesome-version>
 		<!-- Default extra plugins enabled, currently autosave disabled via SAK-33362 -->
@@ -153,7 +153,7 @@
 		<dependency>
 			<groupId>org.webjars.bower</groupId>
 			<artifactId>elfinder</artifactId>
-			<version>2.1.23</version>
+			<version>2.1.28</version>
 			<scope>runtime</scope>
 			<exclusions>
 				<!-- The exclusions are because the bower versions don't have concat/min versions -->

diff --git a/library/src/morpheus-master/sass/modules/editor/_base.scss b/library/src/morpheus-master/sass/modules/editor/_base.scss
@@ -2,7 +2,7 @@
 .cke {
 	.cke_button__sakaipreview {
 		.cke_button__sakaipreview_icon {
-			background: url(/library/webjars/ckeditor/4.8.0/full/skins/moono-lisa/icons_hidpi.png) no-repeat 0 -1632px !important;
+			background: url(/library/webjars/ckeditor/4.9.1/full/skins/moono-lisa/icons_hidpi.png) no-repeat 0 -1632px !important;
 			background-size: 16px !important;
 		}
 	}

diff --git a/library/src/webapp/editor/elfinder/sakai/elfinder.html b/library/src/webapp/editor/elfinder/sakai/elfinder.html
@@ -9,8 +9,8 @@
     <script src="/library/webjars/jquery-ui/1.12.1/jquery-ui.min.js"></script>
 
   <!-- elFinder CSS (REQUIRED) -->
-  <link rel="stylesheet" type="text/css" href="/library/webjars/elfinder/2.1.23/css/elfinder.min.css">
-  <link rel="stylesheet" type="text/css" href="/library/webjars/elfinder/2.1.23/css/theme.css">
+  <link rel="stylesheet" type="text/css" href="/library/webjars/elfinder/2.1.28/css/elfinder.min.css">
+  <link rel="stylesheet" type="text/css" href="/library/webjars/elfinder/2.1.28/css/theme.css">
 
   <!-- Moono Theme CSS -->
   <link rel="stylesheet" href="/library/webjars/fontawesome/4.7.0/css/font-awesome.min.css">
@@ -20,7 +20,7 @@
   <link rel="stylesheet" type="text/css" href="css/sakai-11/theme.css">
 
   <!-- elFinder JS (REQUIRED) -->
-  <script src="/library/webjars/elfinder/2.1.23/js/elfinder.min.js"></script>
+  <script src="/library/webjars/elfinder/2.1.28/js/elfinder.min.js"></script>
 
   <!-- elFinder initialization (REQUIRED) -->
   <!-- Some initialization for Sakai-specific config is done first -->

diff --git a/master/pom.xml b/master/pom.xml
@@ -100,11 +100,11 @@
     <random-source></random-source>
 
     <!-- These should only be updated when the webjars version is updated -->
-    <ckeditor.autosave.version>786318aefed553a62cebbe4cd10b67c3ab266437</ckeditor.autosave.version>
-    <ckeditor.wordcount.version>b29a29d4dc8a42732ce46720e1efc30c826e4c9</ckeditor.wordcount.version>
+    <ckeditor.autosave.version>278c922c6d8529edd15a2b2c11b574fb4320e0c2</ckeditor.autosave.version>
+    <ckeditor.wordcount.version>136ba881ddcff5aa029e3648c69358c15a982afc</ckeditor.wordcount.version>
     <ckeditor.a11ychecker.version>1.1.0</ckeditor.a11ychecker.version>
     <ckeditor.balloonpanel.version>4.6.2</ckeditor.balloonpanel.version>
-    <ckeditor.image2.version>4.8.0</ckeditor.image2.version>
+    <ckeditor.image2.version>4.9.1</ckeditor.image2.version>
 
   </properties>
   <distributionManagement>

diff --git a/...portal-service-impl/impl/src/java/org/sakaiproject/portal/service/EditorRegistryImpl.java b/...portal-service-impl/impl/src/java/org/sakaiproject/portal/service/EditorRegistryImpl.java
@@ -36,8 +36,8 @@ public void init() {
 		//TODO: pull this out to somewhere appropriate
 		register("textarea", "textarea", "/library/editor/textarea/textarea.js", "/library/editor/textarea.launch.js", "");
 		register("fckeditor", "FCKeditor", "/library/editor/FCKeditor/fckeditor.js", "/library/editor/fckeditor.launch.js", "");
-		register("ckeditor", "CKEditor", "/library/webjars/ckeditor/4.8.0/full/ckeditor.js", "/library/editor/ckeditor.launch.js",
-				"var CKEDITOR_BASEPATH='/library/webjars/ckeditor/4.8.0/full/';\n");
+		register("ckeditor", "CKEditor", "/library/webjars/ckeditor/4.9.1/full/ckeditor.js", "/library/editor/ckeditor.launch.js",
+				"var CKEDITOR_BASEPATH='/library/webjars/ckeditor/4.9.1/full/';\n");
 	}
 
 	public void destroy() {

diff --git a/webjars/ckeditor-autosave/pom.xml b/webjars/ckeditor-autosave/pom.xml
@@ -21,7 +21,7 @@
     <!-- Either use a tag or a SHA so the version is predictable. -->
     <!-- Source at https://github.com/w8tcha/CKEditor-AutoSave-Plugin -->
 
-    <version>786318aefed553a62cebbe4cd10b67c3ab266437</version>
+    <version>278c922c6d8529edd15a2b2c11b574fb4320e0c2</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/webjars/ckeditor-image2/pom.xml b/webjars/ckeditor-image2/pom.xml
@@ -20,7 +20,7 @@
     <!-- They're separate here so this can be released independently of the rest of Sakai -->
     <!-- Either use a tag or a SHA so the version is predictable. -->
     <!-- Source at https://ckeditor.com/cke4/addon/image2 -->
-    <version>4.8.0</version>
+    <version>4.9.1</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -54,10 +54,10 @@
                                 <echo message="unzip archives" />
                                 <unzip src="${project.build.directory}/${project.artifactId}.zip" dest="${project.build.directory}"/>
 
--                                <echo message="moving resources" />
--                                <move todir="${destDir}">
--                                    <fileset dir="${project.build.directory}/image2" excludes="samples/" />
--                                </move>
+                                <echo message="moving resources" />
+                                <move todir="${destDir}">
+                                    <fileset dir="${project.build.directory}/image2" excludes="samples/" />
+                                </move>
                             </target>
                         </configuration>
                     </execution>

diff --git a/webjars/ckeditor-wordcount/pom.xml b/webjars/ckeditor-wordcount/pom.xml
@@ -20,7 +20,7 @@
     <!-- They're separate here so this can be released independently of the rest of Sakai -->
     <!-- Either use a tag or a SHA so the version is predictable. -->
     <!-- Source at https://github.com/w8tcha/CKEditor-WordCount-Plugin -->
-    <version>b29a29d4dc8a42732ce46720e1efc30c826e4c9</version>
+    <version>136ba881ddcff5aa029e3648c69358c15a982afc</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>