WICKET-6014 TransparentWebMarkupContainer breaks OnChangeAjaxBehavior for Select2
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ac010c46 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ac010c46 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ac010c46 Branch: refs/heads/lambdas Commit: ac010c466fa8534e31f9c777a1448cfdc875581f Parents: 6217815 Author: Andrea Del Bene <[email protected]> Authored: Fri Oct 30 11:27:08 2015 +0100 Committer: Andrea Del Bene <[email protected]> Committed: Fri Oct 30 12:44:14 2015 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/MarkupContainer.java | 8 ++++++-- .../java/org/apache/wicket/markup/html/border/Border.java | 4 ++-- .../markup/html/form/feedback/FeedbackFormPage_result2.html | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/ac010c46/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java index 0c04a54..3b1bf8d 100644 --- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java +++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java @@ -1765,11 +1765,15 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp */ private void dequeueChild(Component child, ComponentTag tag, DequeueContext dequeue) { - if (child == null || child instanceof IQueueRegion) + if (child == null) { // could not dequeue, or is a dequeue container dequeue.skipToCloseTag(); - + } + else if (child instanceof IQueueRegion) + { + ((IQueueRegion)child).dequeue(); + dequeue.skipToCloseTag(); } else if (child instanceof MarkupContainer) { http://git-wip-us.apache.org/repos/asf/wicket/blob/ac010c46/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java index 36adbe1..5125bd5 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java @@ -167,7 +167,7 @@ public abstract class Border extends WebMarkupContainer implements IComponentRes body = new BorderBodyContainer(id + "_" + BODY); } - + /** * @return The border body container */ @@ -206,7 +206,7 @@ public abstract class Border extends WebMarkupContainer implements IComponentRes { for (Component component : children) { - if (component.equals(body)) + if (component == body) { addToBorder(component); } http://git-wip-us.apache.org/repos/asf/wicket/blob/ac010c46/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html index ced751f..da7d6b2 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html @@ -1,6 +1,6 @@ <html> <body> -<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.feedback.FeedbackFormPage?0-2.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> +<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.feedback.FeedbackFormPage?1-2.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> <span wicket:id="feedback"><wicket:border> <wicket:body> <input type="text" wicket:id="input" value="" name="feedback:feedback_body:input">
