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/02 14:26:15 UTC
wicket git commit: WICKET-5988 WICKET-5981 breaks forms inside borders
Repository: wicket
Updated Branches:
refs/heads/master be18152c3 -> 00019e07c
WICKET-5988 WICKET-5981 breaks forms inside borders
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/00019e07
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/00019e07
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/00019e07
Branch: refs/heads/master
Commit: 00019e07c3837eae6d0c75d00c0943e46b76f22b
Parents: be18152
Author: Andrea Del Bene <ad...@apache.org>
Authored: Fri Oct 2 14:24:11 2015 +0200
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Fri Oct 2 14:24:11 2015 +0200
----------------------------------------------------------------------
.../org/apache/wicket/markup/html/border/Border.java | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/00019e07/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 6888efb..766d296 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
@@ -630,4 +630,18 @@ public abstract class Border extends WebMarkupContainer implements IComponentRes
return borderMarkup != null ? borderMarkup : markup;
}
+
+ @Override
+ protected void onBeforeRender()
+ {
+ super.onBeforeRender();
+ /**
+ * https://issues.apache.org/jira/browse/WICKET-5981
+ * dequeue border to adjust children hierarchy.
+ */
+ if (!hasBeenRendered())
+ {
+ dequeue();
+ }
+ }
}