Updated Branches: refs/heads/wicket-1.5.x c073f4b2c -> a32b48e04
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/a32b48e0 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a32b48e0 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a32b48e0 Branch: refs/heads/wicket-1.5.x Commit: a32b48e0413c0f1890e051a0ee0b9dd3b3a40e64 Parents: c073f4b Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed Oct 3 13:57:04 2012 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Oct 3 13:57:04 2012 +0300 ---------------------------------------------------------------------- .../apache/wicket/util/string/JavaScriptUtils.java | 4 ++-- .../wicket/util/string/JavaScriptUtilsTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/a32b48e0/wicket-core/src/main/java/org/apache/wicket/util/string/JavaScriptUtils.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/util/string/JavaScriptUtils.java b/wicket-core/src/main/java/org/apache/wicket/util/string/JavaScriptUtils.java index 973652b..2a32fa8 100644 --- a/wicket-core/src/main/java/org/apache/wicket/util/string/JavaScriptUtils.java +++ b/wicket-core/src/main/java/org/apache/wicket/util/string/JavaScriptUtils.java @@ -140,7 +140,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"); } @@ -198,7 +198,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/a32b48e0/wicket-core/src/test/java/org/apache/wicket/util/string/JavaScriptUtilsTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/util/string/JavaScriptUtilsTest.java b/wicket-core/src/test/java/org/apache/wicket/util/string/JavaScriptUtilsTest.java index 074da7b..4c1dd3f 100644 --- a/wicket-core/src/test/java/org/apache/wicket/util/string/JavaScriptUtilsTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/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()); } }
