You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by pb...@apache.org on 2007/06/27 06:42:41 UTC
svn commit: r551038 -
/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java
Author: pbenedict
Date: Tue Jun 26 21:42:40 2007
New Revision: 551038
URL: http://svn.apache.org/viewvc?view=rev&rev=551038
Log:
STR-2893: Emit CDATA section for XHTML javascript
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java
Modified: struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java?view=diff&rev=551038&r1=551037&r2=551038
==============================================================================
--- struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java (original)
+++ struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java Tue Jun 26 21:42:40 2007
@@ -700,11 +700,10 @@
results.append(">");
results.append(lineEnd);
- // xhtml script content shouldn't use the browser hiding trick
- if (!this.isXhtml()) {
- results.append(" <!--");
- results.append(lineEnd);
- }
+ // xhtml content should emit CDATA section
+ // but html content should use the browser hiding trick
+ results.append(isXhtml() ? "<![CDATA[" : "<!--");
+ results.append(lineEnd);
// Construct the control name that will receive focus.
// This does not include any index.
@@ -746,10 +745,8 @@
results.append(" }");
results.append(lineEnd);
- if (!this.isXhtml()) {
- results.append(" // -->");
- results.append(lineEnd);
- }
+ results.append(isXhtml() ? "]]>" : "// -->");
+ results.append(lineEnd);
results.append("</script>");
results.append(lineEnd);