Updated Branches: refs/heads/master f3c4baec7 -> eccb3b118
WICKET-4777 JavaScriptReference escapes given URL Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/eccb3b11 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/eccb3b11 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/eccb3b11 Branch: refs/heads/master Commit: eccb3b11875f93d9ad99ae680b4283008c75ee37 Parents: f3c4bae Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed Oct 3 13:55:23 2012 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Oct 3 13:55:23 2012 +0300 ---------------------------------------------------------------------- .../wicket/core/util/string/JavaScriptUtils.java | 4 ++-- .../core/util/string/JavaScriptUtilsTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/eccb3b11/wicket-core/src/main/java/org/apache/wicket/core/util/string/JavaScriptUtils.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/string/JavaScriptUtils.java b/wicket-core/src/main/java/org/apache/wicket/core/util/string/JavaScriptUtils.java index f07d515..42d9274 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/util/string/JavaScriptUtils.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/util/string/JavaScriptUtils.java @@ -143,7 +143,7 @@ public class JavaScriptUtils response.write("charset=\"" + Strings.escapeMarkup(charset) + "\" "); } response.write("src=\""); - response.write(Strings.escapeMarkup(url)); + response.write(url); response.write("\"></script>"); response.write("\n"); } @@ -201,7 +201,7 @@ public class JavaScriptUtils response.write("<script type=\"text/javascript\" "); if (id != null) { - response.write("id=\"" + id + "\""); + response.write("id=\"" + Strings.escapeMarkup(id) + "\""); } response.write(">"); response.write(SCRIPT_CONTENT_PREFIX); http://git-wip-us.apache.org/repos/asf/wicket/blob/eccb3b11/wicket-core/src/test/java/org/apache/wicket/core/util/string/JavaScriptUtilsTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/core/util/string/JavaScriptUtilsTest.java b/wicket-core/src/test/java/org/apache/wicket/core/util/string/JavaScriptUtilsTest.java index 5fe9ae0..c984a0c 100644 --- a/wicket-core/src/test/java/org/apache/wicket/core/util/string/JavaScriptUtilsTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/core/util/string/JavaScriptUtilsTest.java @@ -39,6 +39,6 @@ public class JavaScriptUtilsTest extends Assert String charset = "some&bad%%charset"; JavaScriptUtils.writeJavaScriptUrl(response, url, id, defer, charset); - assertEquals("<script type=\"text/javascript\" id=\"some&bad%id\" defer=\"defer\" charset=\"some&bad%%charset\" src=\"some/url;jsessionid=1234?p1=v1&p2=v2\"></script>\n", response.toString()); + assertEquals("<script type=\"text/javascript\" id=\"some&bad%id\" defer=\"defer\" charset=\"some&bad%%charset\" src=\"some/url;jsessionid=1234?p1=v1&p2=v2\"></script>\n", response.toString()); } }
