Skip to content

Commit 32daae4

Browse files
Miguel Pellicerern
Miguel Pellicer
authored andcommittedSep 18, 2018
SAK-40624 - CKEDITOR 4.10.1 update and plugins (sakaiproject#5997)
1 parent 8fc22a0 commit 32daae4

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed
 

‎library/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<packaging>war</packaging>
1515
<properties>
1616
<!-- This is used in re-write rules as well -->
17-
<ckeditor.version>4.10.0</ckeditor.version>
17+
<ckeditor.version>4.10.1</ckeditor.version>
1818
<bootstrap-version>3.3.7</bootstrap-version>
1919
<font-awesome-version>4.7.0</font-awesome-version>
2020
<!-- Default extra plugins enabled, currently autosave disabled via SAK-33362 -->
@@ -159,7 +159,7 @@
159159
<dependency>
160160
<groupId>org.webjars.bower</groupId>
161161
<artifactId>elfinder</artifactId>
162-
<version>2.1.39</version>
162+
<version>2.1.42</version>
163163
<scope>runtime</scope>
164164
<exclusions>
165165
<!-- The exclusions are because the bower versions don't have concat/min versions -->

‎library/src/morpheus-master/sass/modules/editor/_base.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
.cke {
33
.cke_button__sakaipreview {
44
.cke_button__sakaipreview_icon {
5-
background: url(/library/webjars/ckeditor/4.10.0/full/skins/moono-lisa/icons_hidpi.png) no-repeat 0 -1632px !important;
5+
background: url(/library/webjars/ckeditor/4.10.1/full/skins/moono-lisa/icons_hidpi.png) no-repeat 0 -1632px !important;
66
background-size: 16px !important;
77
}
88
}

‎library/src/webapp/editor/elfinder/sakai/elfinder.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<script src="/library/webjars/jquery-ui/1.12.1/jquery-ui.min.js"></script>
1010

1111
<!-- elFinder CSS (REQUIRED) -->
12-
<link rel="stylesheet" type="text/css" href="/library/webjars/elfinder/2.1.39/css/elfinder.min.css">
13-
<link rel="stylesheet" type="text/css" href="/library/webjars/elfinder/2.1.39/css/theme.css">
12+
<link rel="stylesheet" type="text/css" href="/library/webjars/elfinder/2.1.42/css/elfinder.min.css">
13+
<link rel="stylesheet" type="text/css" href="/library/webjars/elfinder/2.1.42/css/theme.css">
1414

1515
<!-- Moono Theme CSS -->
1616
<link rel="stylesheet" href="/library/webjars/fontawesome/4.7.0/css/font-awesome.min.css">
@@ -20,7 +20,7 @@
2020
<link rel="stylesheet" type="text/css" href="css/sakai-11/theme.css">
2121

2222
<!-- elFinder JS (REQUIRED) -->
23-
<script src="/library/webjars/elfinder/2.1.39/js/elfinder.min.js"></script>
23+
<script src="/library/webjars/elfinder/2.1.42/js/elfinder.min.js"></script>
2424

2525
<!-- elFinder initialization (REQUIRED) -->
2626
<!-- Some initialization for Sakai-specific config is done first -->

‎portal/portal-service-impl/impl/src/java/org/sakaiproject/portal/service/EditorRegistryImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ public void init() {
3636
//TODO: pull this out to somewhere appropriate
3737
register("textarea", "textarea", "/library/editor/textarea/textarea.js", "/library/editor/textarea.launch.js", "");
3838
register("fckeditor", "FCKeditor", "/library/editor/FCKeditor/fckeditor.js", "/library/editor/fckeditor.launch.js", "");
39-
register("ckeditor", "CKEditor", "/library/webjars/ckeditor/4.10.0/full/ckeditor.js", "/library/editor/ckeditor.launch.js",
40-
"var CKEDITOR_BASEPATH='/library/webjars/ckeditor/4.10.0/full/';\n");
39+
register("ckeditor", "CKEditor", "/library/webjars/ckeditor/4.10.1/full/ckeditor.js", "/library/editor/ckeditor.launch.js",
40+
"var CKEDITOR_BASEPATH='/library/webjars/ckeditor/4.10.1/full/';\n");
4141
}
4242

4343
public void destroy() {

0 commit comments

Comments
 (0)
Please sign in to comment.