dgraham 2003/01/15 19:55:09 Modified: src/share/org/apache/struts/taglib/html JavascriptValidatorTag.java Log: Removed generation of CDATA section for xhtml. Using html comments works better. Revision Changes Path 1.20 +4 -11 jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java Index: JavascriptValidatorTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- JavascriptValidatorTag.java 8 Dec 2002 06:54:51 -0000 1.19 +++ JavascriptValidatorTag.java 16 Jan 2003 03:55:09 -0000 1.20 @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 1999 The Apache Software Foundation. All rights + * Copyright (c) 1999-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -528,12 +528,9 @@ sb.append(this.getStartElement()); - if (this.isXhtml()) { - sb.append("<![CDATA[\r\n"); - } - - if ("true".equals(htmlComment)) + if ("true".equals(htmlComment)) { sb.append(htmlBeginComment); + } sb.append("\n var bCancel = false; \n\n"); if (methodName == null || methodName.length() == 0) @@ -590,10 +587,6 @@ sb.append("\n"); if ("true".equals(htmlComment)){ sb.append(htmlEndComment); - } - - if (this.isXhtml()) { - sb.append("]]>\r\n"); } sb.append("</script>\n\n");
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>