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 2012/04/02 10:22:16 UTC
git commit: WICKET-4475 Inline Enclosure needs to check
isVisibleInHierarchy, not only isVisible
Updated Branches:
refs/heads/wicket-1.5.x 89e19bf71 -> d96a12fba
WICKET-4475 Inline Enclosure needs to check isVisibleInHierarchy, not only isVisible
Use determineVisibility() instead of plain isVisible() so that isVisibilityAllowed() and isRenderAllowed() are taken into account.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d96a12fb
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d96a12fb
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d96a12fb
Branch: refs/heads/wicket-1.5.x
Commit: d96a12fbae8ef4b6cbc7fbb73a2bf375b311dfd4
Parents: 89e19bf
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Apr 2 10:20:00 2012 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Apr 2 10:20:00 2012 +0200
----------------------------------------------------------------------
.../markup/html/internal/InlineEnclosure.java | 4 +---
.../protocol/http/AjaxEnclosureListener.java | 3 +--
2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d96a12fb/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/InlineEnclosure.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/InlineEnclosure.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/InlineEnclosure.java
index 9caac6d..f62604e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/InlineEnclosure.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/InlineEnclosure.java
@@ -32,7 +32,6 @@ import org.slf4j.LoggerFactory;
* 'controllingChildId') controls the visibility of the whole enclosure and it's children. This also
* works in Ajax calls without extra markup or java code.
*
- * @see EnclosureResolver
* @see InlineEnclosureHandler
*
* @author Joonas Hamalainen
@@ -51,7 +50,6 @@ public class InlineEnclosure extends Enclosure
*
* @param id
* @param childId
- * @param isInlineEnclosure
*/
public InlineEnclosure(final String id, final String childId)
{
@@ -80,7 +78,7 @@ public class InlineEnclosure extends Enclosure
*/
public boolean updateVisibility()
{
- boolean visible = getChild().isVisible();
+ boolean visible = getChild().determineVisibility();
setVisible(visible);
return visible;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d96a12fb/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 058468c..28e3b7c 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
@@ -53,8 +53,7 @@ import org.apache.wicket.util.visit.IVisitor;
* @see WebApplication
* @see InlineEnclosure
* @see InlineEnclosureHandler
- * @see EnclosureResolver
- *
+ *
* @author Joonas Hamalainen
*/
public class AjaxEnclosureListener implements AjaxRequestTarget.IListener