WICKET-6298 added wicket:head tag to test HeaderPartContainer markup
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/094435ed Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/094435ed Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/094435ed Branch: refs/heads/wicket-7.x Commit: 094435ed6b79e4e6cb791c6f50c17a0c99e10f28 Parents: 3c0ef25 Author: Andrea Del Bene <[email protected]> Authored: Wed Dec 21 15:20:17 2016 +0100 Committer: Andrea Del Bene <[email protected]> Committed: Wed Dec 21 16:00:57 2016 +0100 ---------------------------------------------------------------------- .../markup/html/panel/AssociatedMarkupSourcingStrategy.java | 4 ++-- .../wicket/markup/MarkupVariationTest$VariationPanel_one.html | 3 +++ .../wicket/markup/MarkupVariationTest$VariationPanel_two.html | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/094435ed/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AssociatedMarkupSourcingStrategy.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AssociatedMarkupSourcingStrategy.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AssociatedMarkupSourcingStrategy.java index 572bfcc..3e4dace 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AssociatedMarkupSourcingStrategy.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AssociatedMarkupSourcingStrategy.java @@ -111,7 +111,7 @@ public abstract class AssociatedMarkupSourcingStrategy extends AbstractMarkupSou if (child == null) { //clean any markup previously loaded for children - clearChildrenMarkup(parent); + cleanChildrenMarkup(parent); return markup; } @@ -137,7 +137,7 @@ public abstract class AssociatedMarkupSourcingStrategy extends AbstractMarkupSou * * @param parent */ - private void clearChildrenMarkup(MarkupContainer parent) + private void cleanChildrenMarkup(MarkupContainer parent) { for (Component child : parent) { http://git-wip-us.apache.org/repos/asf/wicket/blob/094435ed/wicket-core/src/test/java/org/apache/wicket/markup/MarkupVariationTest$VariationPanel_one.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupVariationTest$VariationPanel_one.html b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupVariationTest$VariationPanel_one.html index 670be78..8087f24 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupVariationTest$VariationPanel_one.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupVariationTest$VariationPanel_one.html @@ -1,3 +1,6 @@ +<wicket:head> + <style type="text/css">.jqmOverlay {background-color: #CECECE;}</style> +</wicket:head> <wicket:panel> <a wicket:id="l">Change variation</a> http://git-wip-us.apache.org/repos/asf/wicket/blob/094435ed/wicket-core/src/test/java/org/apache/wicket/markup/MarkupVariationTest$VariationPanel_two.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupVariationTest$VariationPanel_two.html b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupVariationTest$VariationPanel_two.html index 20d5832..cd366a3 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupVariationTest$VariationPanel_two.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupVariationTest$VariationPanel_two.html @@ -1,3 +1,6 @@ +<wicket:head> + <style type="text/css">.jqmOverlay {background-color: #CECECE;}</style> +</wicket:head> <wicket:panel> <a wicket:id="l">Change variation</a>
