Updated Branches: refs/heads/master 6540f0251 -> c0e085692 refs/heads/wicket-1.4.x d62a0969d -> 05380900a refs/heads/wicket-1.5.x 49410dbc0 -> 7308d624b
corrected javadoc Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/05380900 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/05380900 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/05380900 Branch: refs/heads/wicket-1.4.x Commit: 05380900ac305f4d3734928128710f9b4a5092e5 Parents: d62a096 Author: svenmeier <[email protected]> Authored: Thu Dec 13 15:01:08 2012 +0100 Committer: svenmeier <[email protected]> Committed: Thu Dec 13 15:01:08 2012 +0100 ---------------------------------------------------------------------- .../apache/wicket/util/string/JavascriptUtils.java | 23 +++++++-------- 1 files changed, 11 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/05380900/wicket/src/main/java/org/apache/wicket/util/string/JavascriptUtils.java ---------------------------------------------------------------------- diff --git a/wicket/src/main/java/org/apache/wicket/util/string/JavascriptUtils.java b/wicket/src/main/java/org/apache/wicket/util/string/JavascriptUtils.java index 1e7dd17..65af964 100644 --- a/wicket/src/main/java/org/apache/wicket/util/string/JavascriptUtils.java +++ b/wicket/src/main/java/org/apache/wicket/util/string/JavascriptUtils.java @@ -18,7 +18,6 @@ package org.apache.wicket.util.string; import org.apache.wicket.Response; - /** * Provide some helpers to write javascript related tags to the response object. * @@ -27,24 +26,24 @@ import org.apache.wicket.Response; public class JavascriptUtils { - /** Script open tag */ - public final static String SCRIPT_OPEN_TAG = "<script type=\"text/javascript\"><!--/*--><![CDATA[/*><!--*/\n"; - - /** Script close tag */ - public final static String SCRIPT_CLOSE_TAG = "\n/*-->]]>*/</script>\n"; - /** - * Script open tag. If this tag is changed, also update Wicket.Head.Contributor.processScript() - * function from wicket-ajax.js + * Prefix for JavaScript CDATA content. If this is changed, also update + * Wicket.Head.Contributor.processScript() function from wicket-ajax.js */ public final static String SCRIPT_CONTENT_PREFIX = "<!--/*--><![CDATA[/*><!--*/\n"; /** - * Script close tag. If this tag is changed, also update Wicket.Head.Contributor.processScript() - * function from wicket-ajax.js + * Suffix for JavaScript CDATA content. If this is changed, also update + * Wicket.Head.Contributor.processScript() function from wicket-ajax.js */ public final static String SCRIPT_CONTENT_SUFFIX = "\n/*-->]]>*/"; + /** Script open tag including content prefix */ + public final static String SCRIPT_OPEN_TAG = "<script type=\"text/javascript\">" + + SCRIPT_CONTENT_PREFIX; + + /** Script close tag including content suffix */ + public final static String SCRIPT_CLOSE_TAG = SCRIPT_CONTENT_SUFFIX + "</script>\n"; /** The response object */ private final Response response; @@ -142,7 +141,7 @@ public class JavascriptUtils public static void writeJavascript(final Response response, final CharSequence text, String id) { writeOpenTag(response, id); - response.write(text); + response.write(Strings.replaceAll(text, "</", "<\\/")); writeCloseTag(response); }
