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/12/21 14:22:55 UTC
[2/2] wicket git commit: WICKET-6298 added wicket:head tag to test
HeaderPartContainer markup
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/43b8e60b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/43b8e60b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/43b8e60b
Branch: refs/heads/master
Commit: 43b8e60b6750f68b78343186fb86222c28398ae1
Parents: 330357a
Author: Andrea Del Bene <ad...@apache.org>
Authored: Wed Dec 21 15:20:17 2016 +0100
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Wed Dec 21 15:21:34 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/43b8e60b/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/43b8e60b/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/43b8e60b/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>