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/30 06:42:19 UTC

svn commit: r552104 - /struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java

Author: pbenedict
Date: Fri Jun 29 21:42:16 2007
New Revision: 552104

URL: http://svn.apache.org/viewvc?view=rev&rev=552104
Log:
STR-2893: Add javascript comment to hide CDATA

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=552104&r1=552103&r2=552104
==============================================================================
--- 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 Fri Jun 29 21:42:16 2007
@@ -702,7 +702,7 @@
 
         // xhtml content should emit CDATA section
         // but html content should use the browser hiding trick
-        results.append(isXhtml() ? "<![CDATA[" : "<!--");
+        results.append(isXhtml() ? "//<![CDATA[" : "<!--");
         results.append(lineEnd);
 
         // Construct the control name that will receive focus.
@@ -745,7 +745,8 @@
         results.append("  }");
         results.append(lineEnd);
 
-        results.append(isXhtml() ? "]]>" : "// -->");
+        results.append("//");
+        results.append(isXhtml() ? "]]>" : "-->");
         results.append(lineEnd);
 
         results.append("</script>");