SAK-40624 - CKEDITOR 4.10.1 update and plugins (sakaiproject#5997)

OTEMA · Sep 18, 2018 · 32daae4 · 32daae4
1 parent 8fc22a0
commit 32daae4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 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.10.0</ckeditor.version>
+		<ckeditor.version>4.10.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 -->
@@ -159,7 +159,7 @@
 		<dependency>
 			<groupId>org.webjars.bower</groupId>
 			<artifactId>elfinder</artifactId>
-			<version>2.1.39</version>
+			<version>2.1.42</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.10.0/full/skins/moono-lisa/icons_hidpi.png) no-repeat 0 -1632px !important;
+			background: url(/library/webjars/ckeditor/4.10.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.39/css/elfinder.min.css">
-  <link rel="stylesheet" type="text/css" href="/library/webjars/elfinder/2.1.39/css/theme.css">
+  <link rel="stylesheet" type="text/css" href="/library/webjars/elfinder/2.1.42/css/elfinder.min.css">
+  <link rel="stylesheet" type="text/css" href="/library/webjars/elfinder/2.1.42/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.39/js/elfinder.min.js"></script>
+  <script src="/library/webjars/elfinder/2.1.42/js/elfinder.min.js"></script>
 
   <!-- elFinder initialization (REQUIRED) -->
   <!-- Some initialization for Sakai-specific config is done first -->

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.10.0/full/ckeditor.js", "/library/editor/ckeditor.launch.js",
-				"var CKEDITOR_BASEPATH='/library/webjars/ckeditor/4.10.0/full/';\n");
+		register("ckeditor", "CKEditor", "/library/webjars/ckeditor/4.10.1/full/ckeditor.js", "/library/editor/ckeditor.launch.js",
+				"var CKEDITOR_BASEPATH='/library/webjars/ckeditor/4.10.1/full/';\n");
 	}
 
 	public void destroy() {