mindol1004/j2html
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #181 from sembler/fix_style_and_script_escaping

Browse Source 
Treating text as unescaped when using TagCreator methods for style and script elements.
This commit is contained in:
Scott Embler
2021-06-03 10:24:45 -04:00
committed by GitHub
parent 2ecd734239 1d43a25457
commit c07facd490
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/src/main/java/j2html/TagCreator.java
View File

@@ -820,10 +820,10 @@ public class TagCreator {
public static SampTag samp (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new SampTag().with(dc), shortAttr); }
public static ScriptTag script () { return new ScriptTag(); }
public static ScriptTag script (String text) { return new ScriptTag().withText(text); }
public static ScriptTag script (String text) { return new ScriptTag().with(new UnescapedText(text)); }
public static ScriptTag script (DomContent... dc) { return new ScriptTag().with(dc); }
public static ScriptTag script (Attr.ShortForm shortAttr) { return Attr.addTo( new ScriptTag(), shortAttr); }
public static ScriptTag script (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new ScriptTag().withText(text), shortAttr); }
public static ScriptTag script (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new ScriptTag().with(new UnescapedText(text)), shortAttr); }
public static ScriptTag script (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new ScriptTag().with(dc), shortAttr); }
public static SectionTag section () { return new SectionTag(); }
@@ -862,10 +862,10 @@ public class TagCreator {
public static StrongTag strong (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new StrongTag().with(dc), shortAttr); }
public static StyleTag style () { return new StyleTag(); }
public static StyleTag style (String text) { return new StyleTag().withText(text); }
public static StyleTag style (String text) { return new StyleTag().with(new UnescapedText(text)); }
public static StyleTag style (DomContent... dc) { return new StyleTag().with(dc); }
public static StyleTag style (Attr.ShortForm shortAttr) { return Attr.addTo( new StyleTag(), shortAttr); }
public static StyleTag style (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new StyleTag().withText(text), shortAttr); }
public static StyleTag style (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new StyleTag().with(new UnescapedText(text)), shortAttr); }
public static StyleTag style (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new StyleTag().with(dc), shortAttr); }
public static SubTag sub () { return new SubTag(); }

24
library/src/test/java/j2html/tags/TagCreatorTest.java
View File

@@ -319,4 +319,28 @@ public class TagCreatorTest {
assertThat(video().render(), is("<video></video>"));
}
@Test
public void script_factories_do_not_escape_text_parameters() {
assertEquals(
"<script>var test = 'Hello, world!';</script>",
script("var test = 'Hello, world!';").render()
);
assertEquals(
"<script id=\"x\">var test = 'Hello, world!';</script>",
script(attrs("#x"), "var test = 'Hello, world!';").render()
);
}
@Test
public void style_factories_do_not_escape_text_parameters() {
assertEquals(
"<style>.test>a {}</style>",
style(".test>a {}").render()
);
assertEquals(
"<style id=\"x\">.test>a {}</style>",
style(attrs("#x"),".test>a {}").render()
);
}
}