update zkckeditor from 4.1.1.0 to 4.3.3.0-FL

zkoss · Mar 14, 2014 · 75ebbc6 · 75ebbc6
1 parent e84c58c
commit 75ebbc6
Show file tree

Hide file tree

Showing 301 changed files with 3,131 additions and 126,642 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,8 +4,12 @@ codegen
 *.class
 javadoc
 Thumbs.db
-ckez/.classpath
-ckez/.project
+*.classpath
+*.project
+*.prefs
+*.component
+*.container
+*.name
 ckez/target/*
 */.settings/*.prefs
 */.settings/*.component

diff --git a/ckez/pom.xml b/ckez/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.zkoss.zkforge</groupId>
 	<artifactId>ckez</artifactId>
-	<version>4.1.1.0</version>
+	<version>4.3.3.0-FL</version>
 	<properties>
 		<zk.version>5.0.6</zk.version>
 	</properties>

diff --git a/ckez/src/archive/metainfo/zk/config.xml b/ckez/src/archive/metainfo/zk/config.xml
@@ -19,7 +19,7 @@ Copyright (C) 2012 Potix Corporation. All Rights Reserved.
 
 	<version>
 		<version-class>org.zkforge.ckez.Version</version-class>
-		<version-uid>4.1.1.0</version-uid>
+		<version-uid>4.3.3.0-FL</version-uid>
 		<zk-version>5.0.6</zk-version><!-- or later -->
 	</version>
 

diff --git a/ckez/src/archive/metainfo/zk/lang-addon.xml b/ckez/src/archive/metainfo/zk/lang-addon.xml
@@ -20,7 +20,7 @@ Copyright (C) 2009 Potix Corporation. All Rights Reserved.
 
 	<version>
 		<version-class>org.zkforge.ckez.Version</version-class>
-		<version-uid>4.1.1.0</version-uid>
+		<version-uid>4.3.3.0-FL</version-uid>
 		<zk-version>5.0.6</zk-version><!-- or later -->
 	</version>
 

diff --git a/ckez/src/archive/web/js/ckez/CKeditor.js b/ckez/src/archive/web/js/ckez/CKeditor.js
@@ -393,8 +393,15 @@ ckez.CKeditor = zk.$extends(zul.Widget, {
 
 
 		if (!zk(wgt).isRealVisible) return;
-		selection = CKEDITOR.env.ie ? selection.getNative().createRange().text: 
-									selection.getNative().toString();		
+
+		// fix selection for ie11
+		if (CKEDITOR.env.ie && CKEDITOR.env.version < 11) {
+			selection = selection.getNative().createRange().text;
+		} else if (CKEDITOR.env.ie && CKEDITOR.env.version > 10) {
+			selection = document.getSelection();
+		} else {
+			selection = selection.getNative().toString();
+		}
 
 		if (selection == '') return;
 

diff --git a/ckez/src/archive/web/js/ckez/ext/CKeditor/LICENSE.md b/ckez/src/archive/web/js/ckez/ext/CKeditor/LICENSE.md
@@ -2,7 +2,7 @@ Software License Agreement
 ==========================
 
 CKEditor - The text editor for Internet - http://ckeditor.com
-Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
 
 Licensed under the terms of any of the following licenses at your
 choice:

diff --git a/ckez/src/archive/web/js/ckez/ext/CKeditor/adapters/jquery.js b/ckez/src/archive/web/js/ckez/ext/CKeditor/adapters/jquery.js