Updated Branches: refs/heads/master 98700005e -> fbb9a2d0f
WICKET-4806 AjaxEditableChoiceLabel won't close select onblur Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/fbb9a2d0 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/fbb9a2d0 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/fbb9a2d0 Branch: refs/heads/master Commit: fbb9a2d0f14288c0480cecd255d44ca1484d8608 Parents: 9870000 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Oct 9 17:32:29 2012 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Oct 9 17:32:29 2012 +0300 ---------------------------------------------------------------------- .../ajax/markup/html/AjaxEditableChoiceLabel.java | 28 ++++++++++++-- 1 files changed, 24 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/fbb9a2d0/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java index a6d6e71..7760d9a 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java @@ -19,6 +19,7 @@ package org.apache.wicket.extensions.ajax.markup.html; import java.util.List; import org.apache.wicket.MarkupContainer; +import org.apache.wicket.ajax.attributes.AjaxCallListener; import org.apache.wicket.ajax.attributes.AjaxRequestAttributes; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.MarkupStream; @@ -208,10 +209,29 @@ public class AjaxEditableChoiceLabel<T> extends AjaxEditableLabel<T> protected void updateAjaxAttributes(AjaxRequestAttributes attributes) { super.updateAjaxAttributes(attributes); - attributes.setEventNames("change"); - attributes.getExtraParameters().put("save", "true"); - List<CharSequence> dynamicParameters = attributes.getDynamicExtraParameters(); - dynamicParameters.add("return Wicket.Form.serializeElement(attrs.c)"); + attributes.setEventNames("change", "blur", "keyup"); + + CharSequence dynamicExtraParameters = "var result = [], " + + "kc=Wicket.Event.keyCode(attrs.event)," + + "evtType=attrs.event.type;console.log(evtType);" + + "if (evtType === 'blur' || (evtType === 'keyup' && kc===27)) {" + + " result.push( { name: 'save', value: false } );" + + "}" + + "else {" + + " result = Wicket.Form.serializeElement(attrs.c);" + + " result.push( { name: 'save', value: true } );" + + "}" + + "return result;"; + attributes.getDynamicExtraParameters().add(dynamicExtraParameters); + + CharSequence precondition = "var kc=Wicket.Event.keyCode(attrs.event)," + + "evtType=attrs.event.type," + + "ret=false;" + + "if(evtType==='blur' || evtType==='change' || (evtType==='keyup' && kc===27)) ret = true;" + + "return ret;"; + AjaxCallListener ajaxCallListener = new AjaxCallListener(); + ajaxCallListener.onPrecondition(precondition); + attributes.getAjaxCallListeners().add(ajaxCallListener); } }); return editor;
