Merge pull request #12 from hanhsu/refix-B70-CKEZ-#9

refix Issue #9: unexpected onChange event after setting the value from t...
zkoss · Oct 16, 2014 · c29ae27 · c29ae27
2 parents 93dcefb + 6e41756
commit c29ae27
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/ckez/src/archive/web/js/ckez/CKeditor.js b/ckez/src/archive/web/js/ckez/CKeditor.js
@@ -25,10 +25,10 @@ ckez.CKeditor = zk.$extends(zul.Widget, {
 			var editor = this.getEditor();
 			if (editor) {
 				editor.setData(v);
-				// Issue #9: update editor's previousValue if set value from server
+				// Issue #9 refix: update editor's previousValue if set value from server
 				// to prevent unexpect onChange event
 				if (fromServer)
-					editor._.previousValue = v;
+					editor._.previousValue = editor.dataProcessor.toHtml(v);
 			}
 		}],
 		autoHeight: null,

diff --git a/test/addon/ckeztest/src/archive/test2/B70-CKEZ-9.zul b/test/addon/ckeztest/src/archive/test2/B70-CKEZ-9.zul
@@ -1,18 +1,19 @@
-<zk>
-	<zscript>
-		String myValue = "initial value";
-		public updateMyValue(String newValue) {
-		myValue = newValue;
-		editor.setValue(myValue);
-		//Clients.showNotification("updated myValue to: " + myValue);
-		}
-	</zscript>
-	<vlayout>
-		<button label="1. update editor value to 'abc'" onClick='updateMyValue("&lt;p&gt;abc&lt;/p&gt;");' />
-		<button label="2. update editor value to 'XYZ'" onClick='updateMyValue("&lt;p&gt;XYZ&lt;/p&gt;");' />
-		<button label="3. do something unrelated and show 'myvalue'"
-			onClick='debugLabel.setValue("myValue: " + myValue);' />
-		<label id="debugLabel" />
-		<ckeditor id="editor" value="${myValue}" onChange='myValue = self.getValue(); alert("changed")' />
-	</vlayout>
-</zk>
+ <zk>
+    <zscript>
+        String myValue = "initial value";
+        public updateMyValue(String newValue) {
+            myValue = newValue;
+            editor.setValue(myValue);
+            //Clients.showNotification("updated myValue to: " + myValue);
+        }
+    </zscript>
+    <vlayout>
+        <button label="1. update editor value to 'abc'" onClick='updateMyValue("abc");'/>
+        <button label="2. update editor value to 'XYZ'" onClick='updateMyValue("XYZ");'/>
+        <button label="1-1 update editor value to 'abc' with p tag" onClick='updateMyValue("&lt;p&gt;abc&lt;/p&gt;");' />
+		<button label="2-1 update editor value to 'XYZ' with p tag" onClick='updateMyValue("&lt;p&gt;XYZ&lt;/p&gt;");' />
+        <button label="3. do something unrelated and show 'myvalue'" onClick='debugLabel.setValue("myValue: " + myValue);'/>
+        <label id="debugLabel"/>
+        <ckeditor id="editor" value="${myValue}" onChange='myValue = self.getValue(); Clients.showNotification("Triggered onChange");'/>
+        </vlayout>
+ </zk>