Updated Branches: refs/heads/master 9ff32f61f -> 0c770f05b
WICKET-4880 Make it possible to override the Ajax behavior of AjaxSubmitLink and AjaxButton Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0c770f05 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0c770f05 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0c770f05 Branch: refs/heads/master Commit: 0c770f05b5b35825c31b81d0145f0faf7e33ae00 Parents: 9ff32f6 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Nov 23 10:18:33 2012 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Nov 23 10:18:33 2012 +0200 ---------------------------------------------------------------------- .../wicket/ajax/markup/html/form/AjaxButton.java | 15 +++++++++- .../ajax/markup/html/form/AjaxSubmitLink.java | 20 ++++++++++++-- 2 files changed, 30 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/0c770f05/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java index 5e397cb..204aced 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java @@ -86,8 +86,19 @@ public abstract class AjaxButton extends Button { super(id, model); this.form = form; + } + + @Override + protected void onInitialize() + { + super.onInitialize(); - add(new AjaxFormSubmitBehavior(form, "click") + add(newAjaxFormSubmitBehavior("click")); + } + + protected AjaxFormSubmitBehavior newAjaxFormSubmitBehavior(String event) + { + return new AjaxFormSubmitBehavior(form, event) { private static final long serialVersionUID = 1L; @@ -127,7 +138,7 @@ public abstract class AjaxButton extends Button { return AjaxButton.this.getDefaultFormProcessing(); } - }); + }; } protected void updateAjaxAttributes(AjaxRequestAttributes attributes) http://git-wip-us.apache.org/repos/asf/wicket/blob/0c770f05/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java index a2ed8beb..0a38fe9 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java @@ -36,6 +36,8 @@ public abstract class AjaxSubmitLink extends AbstractSubmitLink { private static final long serialVersionUID = 1L; + private final Form<?> form; + /** * Construct. * @@ -56,7 +58,20 @@ public abstract class AjaxSubmitLink extends AbstractSubmitLink { super(id, form); - add(new AjaxFormSubmitBehavior(form, "click") + this.form = form; + } + + @Override + protected void onInitialize() + { + super.onInitialize(); + + add(newAjaxFormSubmitBehavior("click")); + } + + protected AjaxFormSubmitBehavior newAjaxFormSubmitBehavior(String event) + { + return new AjaxFormSubmitBehavior(form, event) { private static final long serialVersionUID = 1L; @@ -106,8 +121,7 @@ public abstract class AjaxSubmitLink extends AbstractSubmitLink { AjaxSubmitLink.this.onAfterSubmit(target, getForm()); } - }); - + }; } /**
