You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jc...@apache.org on 2008/12/21 19:22:58 UTC
svn commit: r728467 - in
/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket:
ajax/wicket-ajax.js util/string/JavascriptUtils.java
Author: jcompagner
Date: Sun Dec 21 10:22:58 2008
New Revision: 728467
URL: http://svn.apache.org/viewvc?rev=728467&view=rev
Log:
remove the prefix/suffix from the js text to eval
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/JavascriptUtils.java
Modified: wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js?rev=728467&r1=728466&r2=728467&view=diff
==============================================================================
--- wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js (original)
+++ wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js Sun Dec 21 10:22:58 2008
@@ -1439,6 +1439,9 @@
} else {
// serialize the element content to string
var text = Wicket.DOM.serializeNodeChildren(node);
+ // get rid of prefix and suffix, they are not eval-d correctly
+ text = text.replace(/^<!--\/\*--><!\[CDATA\[\/\*><!--\*\//, "");
+ text = text.replace(/\/\*-->]]>\*\/$/, "");
var id = node.getAttribute("id");
Modified: wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/JavascriptUtils.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/JavascriptUtils.java?rev=728467&r1=728466&r2=728467&view=diff
==============================================================================
--- wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/JavascriptUtils.java (original)
+++ wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/JavascriptUtils.java Sun Dec 21 10:22:58 2008
@@ -33,10 +33,16 @@
/** Script close tag */
public final static String SCRIPT_CLOSE_TAG = "\n/*-->]]>*/</script>\n";
- /** Script open tag */
+ /**
+ * Script open tag. If this tag 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 */
+ /**
+ * Script close tag. If this tag is changed, also update
+ * Wicket.Head.Contributor.processScript() function from wicket-ajax.js
+ */
public final static String SCRIPT_CONTENT_SUFFIX = "\n/*-->]]>*/";