diff --git a/library/pom.xml b/library/pom.xml index 54b8c02cd700..0b22a980a80c 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -14,7 +14,7 @@ war - 4.10.0 + 4.10.1 3.3.7 4.7.0 @@ -159,7 +159,7 @@ org.webjars.bower elfinder - 2.1.39 + 2.1.42 runtime diff --git a/library/src/morpheus-master/sass/modules/editor/_base.scss b/library/src/morpheus-master/sass/modules/editor/_base.scss index d893f0a9c0c8..c51455c557bd 100644 --- 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 index 2777c92bf082..4b151abbfd49 100644 --- a/library/src/webapp/editor/elfinder/sakai/elfinder.html +++ b/library/src/webapp/editor/elfinder/sakai/elfinder.html @@ -9,8 +9,8 @@ - - + + @@ -20,7 +20,7 @@ - + diff --git a/portal/portal-service-impl/impl/src/java/org/sakaiproject/portal/service/EditorRegistryImpl.java b/portal/portal-service-impl/impl/src/java/org/sakaiproject/portal/service/EditorRegistryImpl.java index dc28276f379f..7550662cf643 100644 --- a/portal/portal-service-impl/impl/src/java/org/sakaiproject/portal/service/EditorRegistryImpl.java +++ b/portal/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() {