You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2015/10/30 11:55:54 UTC
wicket git commit: WICKET-6014 TransparentWebMarkupContainer breaks
OnChangeAjaxBehavior for Select2
Repository: wicket
Updated Branches:
refs/heads/wicket-7.x ec1c0f466 -> abb286614
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/abb28661
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/abb28661
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/abb28661
Branch: refs/heads/wicket-7.x
Commit: abb286614b943d082c861291fe273c085dbfafdb
Parents: ec1c0f4
Author: Andrea Del Bene <ad...@apache.org>
Authored: Fri Oct 30 11:27:08 2015 +0100
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Fri Oct 30 11:54:47 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/MarkupContainer.java | 9 ++++++---
.../java/org/apache/wicket/markup/html/border/Border.java | 5 ++---
.../markup/html/form/feedback/FeedbackFormPage_result2.html | 2 +-
3 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/abb28661/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 b739d47..7b42e84 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -23,7 +23,6 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.NoSuchElementException;
import org.apache.wicket.core.util.string.ComponentStrings;
import org.apache.wicket.markup.ComponentTag;
@@ -1872,11 +1871,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/abb28661/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 f0d5412..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
@@ -166,9 +166,8 @@ public abstract class Border extends WebMarkupContainer implements IComponentRes
super(id, model);
body = new BorderBodyContainer(id + "_" + BODY);
- //addToBorder(body);
}
-
+
/**
* @return The border body container
*/
@@ -207,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/abb28661/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">