Skip to content

Commit

Permalink
4.21.0.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
kuotsanhsu committed May 9, 2023
2 parents 3740759 + 2de562a commit 1b3a2d2
Show file tree
Hide file tree
Showing 298 changed files with 9,581 additions and 3,928 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.20.1.0</version>
<version>4.21.0.0</version>
<properties>
<zk.version>5.0.6</zk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.4</version>
<version>1.5</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
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.20.1.0</version-uid>
<version-uid>4.21.0.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.20.1.0</version-uid>
<version-uid>4.21.0.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.20.1.0"/>
<javascript-module name="ckez" version="4.21.0.0"/>

<zscript>
import org.zkforge.ckez.*;
Expand Down
5 changes: 3 additions & 2 deletions ckez/src/archive/web/js/ckez/CKeditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,12 @@ ckez.CKeditor = zk.$extends(zul.Widget, {

_syncSize: function () {
var editor = this._editor,
n = this.$n();
n = this.$n(),
tmp;
// Restore the fix for ZKCK-37 (but moved from `onSize` to `_syncSize` here) that was removed in
// https://github.com/zkoss/zkckeditor/commit/df9697fa81bcdad0222db8d2570f9fa551b238a1
// The issue was re-introduced in release 4.16.2.0 whereas release 4.16.1.1 was not plagued.
if (n && editor?.document?.getWindow()?.$) {
if (n && editor && (tmp = editor.document) && (tmp = tmp.getWindow()) && tmp.$) {
editor.resize('100%', n.clientHeight);
jq(n).css("overflow", "auto");
}
Expand Down
2,872 changes: 1,436 additions & 1,436 deletions ckez/src/archive/web/js/ckez/ext/CKeditor/LICENSE.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ckez/src/archive/web/js/ckez/ext/CKeditor/adapters/jquery.js

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

Loading

0 comments on commit 1b3a2d2

Please sign in to comment.