Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SAK-34036 - Update CKEditor to 4.9.1 and update all plugins #5435

Merged
merged 3 commits into from
Mar 31, 2018
Merged

SAK-34036 - Update CKEditor to 4.9.1 and update all plugins #5435

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c81926
SAK-34036 - Update CKEditor to 4.9.0 and update all plugins
jonespm Mar 26, 2018
05011b9
SAK-34036 - Update elfinder to 2.1.28
jonespm Mar 26, 2018
2e0f252
SAK-34036 - Update CKEditor to 4.9.1
jonespm Mar 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion library/pom.xml
View file
Open in desktop
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.8.0</ckeditor.version>
<ckeditor.version>4.9.0</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 -->
Expand Down
2 changes: 1 addition & 1 deletion library/src/morpheus-master/sass/modules/editor/_base.scss
View file
Open in desktop
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.8.0/full/skins/moono-lisa/icons_hidpi.png) no-repeat 0 -1632px !important;
background: url(/library/webjars/ckeditor/4.9.0/full/skins/moono-lisa/icons_hidpi.png) no-repeat 0 -1632px !important;
background-size: 16px !important;
}
}
Expand Down
6 changes: 3 additions & 3 deletions master/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.0</ckeditor.image2.version>

</properties>
<distributionManagement>
Expand Down
4 changes: 2 additions & 2 deletions ...portal-service-impl/impl/src/java/org/sakaiproject/portal/service/EditorRegistryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.0/full/ckeditor.js", "/library/editor/ckeditor.launch.js",
"var CKEDITOR_BASEPATH='/library/webjars/ckeditor/4.9.0/full/';\n");
}

public void destroy() {
Expand Down
2 changes: 1 addition & 1 deletion webjars/ckeditor-autosave/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions webjars/ckeditor-image2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.0</version>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion webjars/ckeditor-wordcount/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down