You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/03/05 10:55:50 UTC
git commit: WICKET-5457 Problem with nested InlineEnclosures
Repository: wicket
Updated Branches:
refs/heads/master eac410993 -> da1555036
WICKET-5457 Problem with nested InlineEnclosures
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/da155503
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/da155503
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/da155503
Branch: refs/heads/master
Commit: da155503634ffa977779c8f6d7a848f750f18d39
Parents: eac4109
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Mar 5 11:55:19 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Mar 5 11:55:19 2014 +0200
----------------------------------------------------------------------
.../org/apache/wicket/protocol/http/AjaxEnclosureListener.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/da155503/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java
index f07be63..5cbbf31 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java
@@ -107,6 +107,7 @@ public class AjaxEnclosureListener extends AjaxRequestTarget.AbstractListener
private boolean isControllerOfEnclosure(final Component component,
final InlineEnclosure enclosure)
{
- return enclosure.getParent().get(enclosure.getChildId()) == component;
+ return (enclosure.get(enclosure.getChildId()) == component || // #queue()
+ enclosure.getParent().get(enclosure.getChildId()) == component); // #add()
}
}