You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by so...@apache.org on 2018/04/03 14:24:10 UTC
wicket git commit: [WICKET-6546] HTML comments are removed from
inline CSS
Repository: wicket
Updated Branches:
refs/heads/WICKET-6546-no-css-comments [created] 976f28de7
[WICKET-6546] HTML comments are removed from inline CSS
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/976f28de
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/976f28de
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/976f28de
Branch: refs/heads/WICKET-6546-no-css-comments
Commit: 976f28de7a890a5827ef8c160e74a40df2c87709
Parents: 7aa7c64
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Tue Apr 3 21:23:48 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Tue Apr 3 21:23:48 2018 +0700
----------------------------------------------------------------------
.../org/apache/wicket/core/util/string/CssUtils.java | 13 ++++++++-----
.../markup/html/internal/HeaderResponseTest.java | 4 ++--
2 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/976f28de/wicket-core/src/main/java/org/apache/wicket/core/util/string/CssUtils.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/string/CssUtils.java b/wicket-core/src/main/java/org/apache/wicket/core/util/string/CssUtils.java
index 4013e83..b028b43 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/util/string/CssUtils.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/util/string/CssUtils.java
@@ -27,11 +27,14 @@ import org.apache.wicket.util.string.Strings;
*/
public final class CssUtils
{
+ /** start of CSS inline open tag */
+ public final static String INLINE_OPEN_TAG_START = "<style type=\"text/css\"";
+
/** CSS inline open tag */
- public final static String INLINE_OPEN_TAG = "<style type=\"text/css\"><!--\n";
+ public final static String INLINE_OPEN_TAG = INLINE_OPEN_TAG_START + ">\n";
/** CSS inline close tag */
- public final static String INLINE_CLOSE_TAG = "--></style>\n";
+ public final static String INLINE_CLOSE_TAG = "</style>\n";
/**
* Hidden constructor.
@@ -64,12 +67,12 @@ public final class CssUtils
*/
public static void writeOpenTag(final Response response, String id)
{
- response.write("<style type=\"text/css\" ");
+ response.write(INLINE_OPEN_TAG_START);
if (id != null)
{
- response.write("id=\"" + id + "\"");
+ response.write(" id=\"" + id + "\"");
}
- response.write("><!--\n");
+ response.write(">\n");
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/976f28de/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HeaderResponseTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HeaderResponseTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HeaderResponseTest.java
index d0b9978..8495e7c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HeaderResponseTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HeaderResponseTest.java
@@ -138,8 +138,8 @@ public class HeaderResponseTest
public void conditionalRenderCSSContent()
{
headerResponse.render(CssHeaderItem.forCSS(".className { font-size: 10px}", "id", "lt IE 8"));
- String expected = "<!--[if lt IE 8]><style type=\"text/css\" id=\"id\"><!--\n" +
- ".className { font-size: 10px}--></style>\n" +
+ String expected = "<!--[if lt IE 8]><style type=\"text/css\" id=\"id\">\n" +
+ ".className { font-size: 10px}</style>\n" +
"<![endif]-->\n";
String actual = headerResponse.getResponse().toString();
Assert.assertEquals(expected, actual);