Repository: wicket Updated Branches: refs/heads/master cd24f18a2 -> e48d10577
WICKET-5597 prevent unwanted submit; aligned AjaxLink, AjaxSubmitLink and SubmitLink Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e48d1057 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e48d1057 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e48d1057 Branch: refs/heads/master Commit: e48d10577151ba1487e37efaafeb38357a111b23 Parents: cd24f18 Author: svenmeier <[email protected]> Authored: Wed May 21 07:15:27 2014 +0200 Committer: svenmeier <[email protected]> Committed: Wed May 21 07:15:27 2014 +0200 ---------------------------------------------------------------------- .../java/org/apache/wicket/ajax/markup/html/AjaxLink.java | 7 ++++++- .../apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java | 9 ++++++++- .../java/org/apache/wicket/markup/html/form/SubmitLink.java | 9 ++++++++- 3 files changed, 22 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/e48d1057/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java index 3f75896..cb55387 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java @@ -104,12 +104,17 @@ public abstract class AjaxLink<T> extends AbstractLink implements IAjaxLink, IGe if (isEnabledInHierarchy()) { - // disable any href attr in markup if (tag.getName().equalsIgnoreCase("a") || tag.getName().equalsIgnoreCase("link") || tag.getName().equalsIgnoreCase("area")) { + // disable any href attr in markup tag.put("href", "javascript:;"); } + else if (tag.getName().equalsIgnoreCase("button")) + { + // WICKET-5597 prevent submit + tag.put("type", "button"); + } } else { http://git-wip-us.apache.org/repos/asf/wicket/blob/e48d1057/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 5b77ea2..940f405 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 @@ -155,10 +155,17 @@ public abstract class AjaxSubmitLink extends AbstractSubmitLink if (isEnabledInHierarchy()) { - if (tag.getName().toLowerCase().equals("a")) + if (tag.getName().equalsIgnoreCase("a") || tag.getName().equalsIgnoreCase("link") + || tag.getName().equalsIgnoreCase("area")) { + // disable any href attr in markup tag.put("href", "javascript:;"); } + else if (tag.getName().equalsIgnoreCase("button")) + { + // WICKET-5597 prevent default submit + tag.put("type", "button"); + } } else { http://git-wip-us.apache.org/repos/asf/wicket/blob/e48d1057/wicket-core/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java index d01ec8b..82428a4 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java @@ -158,10 +158,17 @@ public class SubmitLink extends AbstractSubmitLink if (isEnabledInHierarchy()) { - if (tag.getName().equalsIgnoreCase("a")) + if (tag.getName().equalsIgnoreCase("a") || tag.getName().equalsIgnoreCase("link") + || tag.getName().equalsIgnoreCase("area")) { tag.put("href", "javascript:;"); } + else if (tag.getName().equalsIgnoreCase("button")) + { + // WICKET-5597 prevent default submit + tag.put("type", "button"); + } + tag.put("onclick", getTriggerJavaScript()); } else
