Skip to content

Commit

Permalink
ZKCK-73: update to 4.17.1 for security fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
b952426 committed Jan 5, 2022
1 parent b5aa01d commit 7922871
Show file tree
Hide file tree
Showing 213 changed files with 1,752 additions and 156 deletions.
4 changes: 2 additions & 2 deletions ckez/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.zkoss.zkforge</groupId>
<artifactId>ckez</artifactId>
<version>4.17.0.0-SNAPSHOT</version>
<version>4.17.1.0-SNAPSHOT</version>
<properties>
<zk.version>5.0.6</zk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -15,7 +15,7 @@
<name>The CKEditor Component for ZK</name>
<url>https://www.zkoss.org</url>
<description>The CKEditor Component for ZK 5.0.0 or later</description>
<organization>
<organization>./upVer oldver newver
<name>Potix Corporation</name>
</organization>
<licenses>
Expand Down
2 changes: 1 addition & 1 deletion ckez/src/archive/metainfo/zk/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Copyright (C) 2012 Potix Corporation. All Rights Reserved.

<version>
<version-class>org.zkforge.ckez.Version</version-class>
<version-uid>4.17.0.0</version-uid>
<version-uid>4.17.1.0</version-uid>
<zk-version>5.0.6</zk-version><!-- or later -->
</version>

Expand Down
4 changes: 2 additions & 2 deletions ckez/src/archive/metainfo/zk/lang-addon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Copyright (C) 2009 Potix Corporation. All Rights Reserved.

<version>
<version-class>org.zkforge.ckez.Version</version-class>
<version-uid>4.17.0.0</version-uid>
<version-uid>4.17.1.0</version-uid>
<zk-version>5.0.6</zk-version><!-- or later -->
</version>

Expand All @@ -31,7 +31,7 @@ Copyright (C) 2009 Potix Corporation. All Rights Reserved.
such that, if the version is changed, the browser will reload them.
The name is either a package's name or a portion of it.
-->
<javascript-module name="ckez" version="4.17.0.0"/>
<javascript-module name="ckez" version="4.17.1.0"/>

<zscript>
import org.zkforge.ckez.*;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

216 changes: 175 additions & 41 deletions ckez/src/archive/web/js/ckez/ext/CKeditor/ckeditor.js

Large diffs are not rendered by default.

34 changes: 3 additions & 31 deletions ckez/src/archive/web/js/ckez/ext/CKeditor/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,7 @@
*/

CKEDITOR.editorConfig = function( config ) {
// Define changes to default configuration here.
// For complete reference see:
// https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html

// The toolbar groups arrangement, optimized for two toolbar rows.
config.toolbarGroups = [
{ name: 'clipboard', groups: [ 'clipboard', 'undo' ] },
{ name: 'editing', groups: [ 'find', 'selection', 'spellchecker' ] },
{ name: 'links' },
{ name: 'insert' },
{ name: 'forms' },
{ name: 'tools' },
{ name: 'document', groups: [ 'mode', 'document', 'doctools' ] },
{ name: 'others' },
'/',
{ name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] },
{ name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'bidi' ] },
{ name: 'styles' },
{ name: 'colors' },
{ name: 'about' }
];

// Remove some buttons provided by the standard plugins, which are
// not needed in the Standard(s) toolbar.
config.removeButtons = 'Underline,Subscript,Superscript';

// Set the most common block elements.
config.format_tags = 'p;h1;h2;h3;pre';

// Simplify the dialog windows.
config.removeDialogTabs = 'image:advanced;link:advanced';
// Define changes to default configuration here. For example:
// config.language = 'fr';
// config.uiColor = '#AADC6E';
};
2 changes: 1 addition & 1 deletion ckez/src/archive/web/js/ckez/ext/CKeditor/lang/af.js

Large diffs are not rendered by default.

Loading

0 comments on commit 7922871

Please sign in to comment.