cvs commit: jakarta-struts/web/validator jsType.jsp staticJavascript.jsp

[rleland]

rleland     2002/10/18 09:58:10

  Modified:    doc/userGuide dev_validator.xml
               src/share/org/apache/struts/taglib/html
                        JavascriptValidatorTag.java
               web/validator jsType.jsp
  Removed:     web/validator staticJavascript.jsp
  Log:
  Bug 11950
  
  Ok a work around that has been in the Validator
  example for a "bug" in Netscape was really
  a bug in the JavaScriptTag. The workaround
  caused problems once the real bug was fixed.
  Tested with NS 4.08, Mozilla 1.1, IE 6.0
  
  Revision  Changes    Path
  1.6       +4 -0      jakarta-struts/doc/userGuide/dev_validator.xml
  
  Index: dev_validator.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/doc/userGuide/dev_validator.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- dev_validator.xml 16 Oct 2002 18:44:30 -0000      1.5
  +++ dev_validator.xml 18 Oct 2002 16:58:09 -0000      1.6
  @@ -21,7 +21,11 @@
   <ul>
   <li> Conditionally required fields</li>
   <li> intRange() &amp; floatRange() methods in both JavaScript and Java</li>
  +<li> Do <strong>not</strong> use the &lt;script/&gt; to include static java script
  +as in the old validator example.
  + </li>
   <li> deprecation of range() methods in both JavaScript and Java</li>
  +<li> deprecation of StrutsVlaidator &amp; StrutsValidatorUtil</li>
   </ul>
   
   <p>
  
  
  
  1.8       +4 -2      
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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JavascriptValidatorTag.java       18 Oct 2002 01:35:02 -0000      1.7
  +++ JavascriptValidatorTag.java       18 Oct 2002 16:58:10 -0000      1.8
  @@ -393,13 +393,15 @@
                   }
                   results.append("    } \n\n");
               }
  +        } else if ("true".equals(staticJavascript)) {
  +            results.append("<script language=\"Javascript1.1\">");
           }
   
           if ("true".equals(staticJavascript)) {
               results.append(getJavascriptStaticMethods(resources));
           }
   
  -        if ("true".equals(dynamicJavascript)) {
  +        if ("true".equals(dynamicJavascript) || "true".equals(staticJavascript)) {
               results.append(getJavascriptEnd());
           }
   
  
  
  
  1.3       +2 -3      jakarta-struts/web/validator/jsType.jsp
  
  Index: jsType.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/validator/jsType.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jsType.jsp        11 Oct 2002 19:13:42 -0000      1.2
  +++ jsType.jsp        18 Oct 2002 16:58:10 -0000      1.3
  @@ -120,9 +120,8 @@
   
   </html:form>
   
  -<html:javascript formName="jsTypeForm" dynamicJavascript="true" 
staticJavascript="false"/>
  -<%-- This wouldn't work right in IE 5.0 when I made the source an attribute of the 
tag ??? --%>
  -<SCRIPT LANGUAGE="Javascript1.1" src="staticJavascript.jsp"></script>
  +<html:javascript formName="jsTypeForm" dynamicJavascript="true" 
staticJavascript="true"/>
  +
   
   </body>
   </html:html>
  
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>