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 2016/01/18 20:56:16 UTC
[1/2] wicket git commit: Comments inside addedComponent to reflect
the new behavior
Repository: wicket
Updated Branches:
refs/heads/wicket-7.x 170e10588 -> cda8a83c8
Comments inside addedComponent to reflect the new behavior
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ac2b2300
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ac2b2300
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ac2b2300
Branch: refs/heads/wicket-7.x
Commit: ac2b23000fcbf64ad47a4d1aa766b6fbe8d564b7
Parents: 170e105
Author: Andrea Del Bene <ad...@apache.org>
Authored: Mon Jan 18 20:47:59 2016 +0100
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Mon Jan 18 20:47:59 2016 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/MarkupContainer.java | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ac2b2300/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 6ad949d..e940184 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -1034,18 +1034,13 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
Page page = findPage();
- // if we have a path to page dequeue any container children.
- // we can do it only if page is not already rendering!
+ // if we have a path to page, dequeue any container children.
if (page != null && child instanceof MarkupContainer)
{
MarkupContainer childContainer = (MarkupContainer)child;
// if we are already dequeueing there is no need to dequeue again
if (!childContainer.getRequestFlag(RFLAG_CONTAINER_DEQUEING))
- {
- /*
- * dequeue both normal and auto components
- *
- */
+ {
childContainer.dequeue();
}
}
[2/2] wicket git commit: WICKET-6078 Problem with queued components
and auto linking
Posted by ad...@apache.org.
WICKET-6078 Problem with queued components and auto linking
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/cda8a83c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/cda8a83c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/cda8a83c
Branch: refs/heads/wicket-7.x
Commit: cda8a83c8c56fb4231185c7f188df34a7c5e6afe
Parents: ac2b230
Author: Andrea Del Bene <ad...@apache.org>
Authored: Mon Jan 18 20:55:26 2016 +0100
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Mon Jan 18 20:55:26 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/wicket/MarkupContainer.java | 4 ++++
.../wicket/queueing/ComponentQueueingTest.java | 16 ++++++++++++++++
2 files changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/cda8a83c/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 e940184..ac74a80 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -2255,6 +2255,10 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
{
return DequeueTagAction.SKIP;
}
+ else if (wicketTag.isLinkTag())
+ {
+ return DequeueTagAction.DEQUEUE;
+ }
else
{
return null; // don't know
http://git-wip-us.apache.org/repos/asf/wicket/blob/cda8a83c/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java b/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java
index 740c6ce..c44efd9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java
@@ -742,6 +742,22 @@ public class ComponentQueueingTest extends WicketTestCase
tester.assertContains("title");
}
+
+ @Test
+ public void queueInsideAutoLink()
+ {
+ TestPage page = new TestPage();
+ page.setPageMarkup("<wicket:link>"
+ + "<a href='test.html'>"
+ + "<wicket:container wicket:id='test'>test</wicket:container>"
+ + "</a></wicket:link>");
+
+ page.queue(new WebMarkupContainer("test"));
+
+ tester.startPage(page);
+
+
+ }
/**
* https://issues.apache.org/jira/browse/WICKET-6036