You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/09/30 14:55:51 UTC

git commit: WICKET-5711 OnChangeAjaxBehavior should listen for both 'inputchange' and 'change' events for TextField and TextArea

Repository: wicket
Updated Branches:
  refs/heads/wicket-6.x 0d0697a79 -> 6501ab739


WICKET-5711 OnChangeAjaxBehavior should listen for both 'inputchange' and 'change' events for TextField and TextArea


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6501ab73
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6501ab73
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6501ab73

Branch: refs/heads/wicket-6.x
Commit: 6501ab7396e888b0eccd70b0b502334a69c823a8
Parents: 0d0697a
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Sep 30 14:55:04 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Sep 30 14:55:04 2014 +0200

----------------------------------------------------------------------
 .../wicket/ajax/form/OnChangeAjaxBehavior.java  | 20 ++++++++------------
 .../OnChangeAjaxBehaviorTestPage_expected.html  |  2 +-
 2 files changed, 9 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/6501ab73/wicket-core/src/main/java/org/apache/wicket/ajax/form/OnChangeAjaxBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/form/OnChangeAjaxBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/form/OnChangeAjaxBehavior.java
index 4f3a78c..a0195cc 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/form/OnChangeAjaxBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/form/OnChangeAjaxBehavior.java
@@ -47,9 +47,9 @@ public abstract class OnChangeAjaxBehavior extends AjaxFormComponentUpdatingBeha
 	 * for text input form component depending on the browser.
 	 * 'change' is used as a fallback for all other form component types.
 	 */
-	@Deprecated
 	public static final String EVENT_NAME = "inputchange change";
-	
+
+	@Deprecated
 	public static final String EVENT_INPUTCHANGE = "inputchange";
 	public static final String EVENT_CHANGE = "change";
 
@@ -58,23 +58,19 @@ public abstract class OnChangeAjaxBehavior extends AjaxFormComponentUpdatingBeha
 	 */
 	public OnChangeAjaxBehavior()
 	{
-		super(EVENT_INPUTCHANGE + " " + EVENT_CHANGE);
+		super(EVENT_NAME);
 	}
 
 	@Override
 	protected void updateAjaxAttributes(AjaxRequestAttributes attributes) 
 	{
 		super.updateAjaxAttributes(attributes);
-		
+
 		Component component = getComponent();
-		
-		//textfiels and textareas will trigger this behavior with event 'inputchange'
-		//while all the other components will use 'change'
-		if (component instanceof TextField || component instanceof TextArea) 
-		{
-			attributes.setEventNames(EVENT_INPUTCHANGE);
-		} 
-		else 
+
+		// textfiels and textareas will trigger this behavior with either 'inputchange' or 'change' events
+		// all the other components will use just 'change'
+		if (!(component instanceof TextField || component instanceof TextArea))
 		{
 			attributes.setEventNames(EVENT_CHANGE);
 		}

http://git-wip-us.apache.org/repos/asf/wicket/blob/6501ab73/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
index e70dd97..9cca96d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
@@ -16,7 +16,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.form.OnChangeAja
 <script type="text/javascript" >
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.form.OnChangeAjaxBehaviorTestPage?0-1.IBehaviorListener.0-form-field","e":"inputchange","c":"field1","ad":true,"m":"POST"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.form.OnChangeAjaxBehaviorTestPage?0-1.IBehaviorListener.0-form-field","e":"inputchange change","c":"field1","ad":true,"m":"POST"});;
 Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.form.OnChangeAjaxBehaviorTestPage?0-1.IBehaviorListener.0-form-dropDown","e":"change","c":"dropDown2","ad":true,"m":"POST"});;
 ;});
 /*]]>*/