Repository: wicket Updated Branches: refs/heads/master 8d89ed51a -> d1b264e65
WICKET-5598 AjaxFallbackButton does not call #onError(ART, Form) when JavaScript disabled Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d1b264e6 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d1b264e6 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d1b264e6 Branch: refs/heads/master Commit: d1b264e6502574fce65bd0513672d59012794645 Parents: 8d89ed5 Author: svenmeier <[email protected]> Authored: Tue May 20 14:04:11 2014 +0200 Committer: svenmeier <[email protected]> Committed: Tue May 20 14:04:11 2014 +0200 ---------------------------------------------------------------------- .../ajax/markup/html/form/AjaxFallbackButton.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/d1b264e6/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java index 8536ab5..0d164fd 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java @@ -111,7 +111,8 @@ public abstract class AjaxFallbackButton extends Button } /** - * Listener method invoked on form submit with errors + * Listener method invoked on form submit with errors. If ajax failed and this event was + * generated via a normal submission, the target argument will be null. * * @param target * @param form @@ -120,6 +121,15 @@ public abstract class AjaxFallbackButton extends Button { } + @Override + public final void onError() + { + if (getRequestCycle().find(AjaxRequestTarget.class) == null) + { + onError(null, getForm()); + } + } + /** * @see org.apache.wicket.markup.html.form.IFormSubmittingComponent#onSubmit() */
