Repository: wicket Updated Branches: refs/heads/wicket-6.x b82e1cab7 -> 13dc33049
WICKET-5731 Using "Submit" button in Ajax DropDownChoice example leads to broken HTML page (cherry picked from commit 93ff3f45b64f9c7a7126a3c03724cbb5d11c95dc) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/13dc3304 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/13dc3304 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/13dc3304 Branch: refs/heads/wicket-6.x Commit: 13dc33049ad51db4969778cb5f2dcf6a1cf6df28 Parents: b82e1ca Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Oct 21 10:27:27 2014 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Oct 21 10:27:52 2014 +0300 ---------------------------------------------------------------------- .../wicket/examples/ajax/builtin/BasePage.html | 4 ++-- .../wicket/examples/ajax/builtin/ChoicePage.html | 6 +++--- .../wicket/examples/ajax/builtin/ChoicePage.java | 19 ++++++++++++++++++- 3 files changed, 23 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/13dc3304/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.html index 136bb84..c013695 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.html @@ -5,8 +5,8 @@ <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"/> + <span wicket:id="mainNavigation"></span> <a href="Index.html" wicket:id="back">[go back]</a><p/> <wicket:child/> </body> -</html> \ No newline at end of file +</html> http://git-wip-us.apache.org/repos/asf/wicket/blob/13dc3304/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.html index 695a5ab..27c44bf 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.html @@ -9,7 +9,7 @@ Whenever the Make select box value is changed it will submit the new value to se <form wicket:id="form"> <select wicket:id="makes"></select> <select wicket:id="models"></select> - <input type="submit" /> + <input type="submit" wicket:id="go" value="Submit"/> </form> - -</wicket:extend> \ No newline at end of file +<div wicket:id="feedback"></div> +</wicket:extend> http://git-wip-us.apache.org/repos/asf/wicket/blob/13dc3304/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.java index d612cb0..015f758 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.java @@ -25,8 +25,10 @@ import java.util.Map; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; +import org.apache.wicket.ajax.markup.html.form.AjaxButton; import org.apache.wicket.markup.html.form.DropDownChoice; import org.apache.wicket.markup.html.form.Form; +import org.apache.wicket.markup.html.panel.FeedbackPanel; import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; @@ -107,6 +109,21 @@ public class ChoicePage extends BasePage form.add(makes); form.add(models); + final FeedbackPanel feedback = new FeedbackPanel("feedback"); + feedback.setOutputMarkupId(true); + add(feedback); + + form.add(new AjaxButton("go") + { + @Override + protected void onAfterSubmit(AjaxRequestTarget target, Form<?> form) + { + super.onAfterSubmit(target, form); + info("You have selected: " + makes.getModelObject() + " " + models.getModelObject()); + target.add(feedback); + } + }); + makes.add(new AjaxFormComponentUpdatingBehavior("change") { @Override @@ -116,4 +133,4 @@ public class ChoicePage extends BasePage } }); } -} \ No newline at end of file +}
