Skip to content

Commit

Permalink
SAK-42930 WebJars: Upgrade CKEDITOR from 4.13.0 to 4.13.1 (sakaiproje…
Browse files Browse the repository at this point in the history
  • Loading branch information
Miguel Pellicer authored Jan 7, 2020
1 parent ba02d1f commit c7dc6a4
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion library/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<packaging>war</packaging>
<properties>
<!-- This is used in re-write rules as well -->
<ckeditor.version>4.13.0</ckeditor.version>
<ckeditor.version>4.13.1</ckeditor.version>
<bootstrap-version>3.3.7</bootstrap-version>
<font-awesome-version>4.7.0</font-awesome-version>
<!-- Default extra plugins enabled -->
Expand Down
2 changes: 1 addition & 1 deletion library/src/morpheus-master/sass/modules/editor/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.cke {
.cke_button__sakaipreview {
.cke_button__sakaipreview_icon {
background: url(/library/webjars/ckeditor/4.13.0/full/skins/moono-lisa/icons_hidpi.png) no-repeat 0 -1632px !important;
background: url(/library/webjars/ckeditor/4.13.1/full/skins/moono-lisa/icons_hidpi.png) no-repeat 0 -1632px !important;
background-size: 16px !important;
}
}
Expand Down
2 changes: 1 addition & 1 deletion library/src/webapp/js/headscripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@ function includeWebjarLibrary(library) {
libraryVersion = "1.10.20";
document.write('\x3Cscript src="' + webjars + 'datatables/' + libraryVersion + '/js/jquery.dataTables.min.js' + ver + '">' + '\x3C/script>');
} else if (library == 'ckeditor') {
libraryVersion = "4.13.0";
libraryVersion = "4.13.1";
document.write('\x3Cscript src="' + webjars + 'ckeditor/' + libraryVersion + '/full/ckeditor.js' + ver + '">' + '\x3C/script>');
} else if (library == 'awesomplete') {
libraryVersion = "1.1.4";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class EditorRegistryImpl implements EditorRegistry {
private HashMap<String, Editor> editors = new HashMap<String, Editor>();

public void init() {
String ckEditorVersion = "4.13.0";
String ckEditorVersion = "4.13.1";
//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", "");
Expand Down

0 comments on commit c7dc6a4

Please sign in to comment.