You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by ni...@apache.org on 2006/03/07 16:32:08 UTC
svn commit: r383907 -
/struts/taglib/trunk/src/java/org/apache/struts/taglib/html/JavascriptValidatorTag.java
Author: niallp
Date: Tue Mar 7 07:32:06 2006
New Revision: 383907
URL: http://svn.apache.org/viewcvs?rev=383907&view=rev
Log:
Fix for Bug 37685 - Javascript tag does not work on Mozilla - reported by Philippe Mouawad.
Changed the javascript rendered so that it just returns formValidationResult if the "&&" operators are used (stopOnFirstError is true) or (formValidationResult == 1) if the bitwise (i.e. "&") operator is used (stopOnFirstError is false).
Also added braces to the if statement and tidied up the indentation.
Modified:
struts/taglib/trunk/src/java/org/apache/struts/taglib/html/JavascriptValidatorTag.java
Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/html/JavascriptValidatorTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/html/JavascriptValidatorTag.java?rev=383907&r1=383906&r2=383907&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/html/JavascriptValidatorTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/html/JavascriptValidatorTag.java Tue Mar 7 07:32:06 2006
@@ -752,31 +752,33 @@
sb.append(HTML_BEGIN_COMMENT);
}
- sb.append("\n var bCancel = false; \n\n");
+ sb.append("\n var bCancel = false; \n\n");
if ((methodName == null) || (methodName.length() == 0)) {
- sb.append(" function validate" + name
- + "(form) { \n");
+ sb.append(" function validate" + name + "(form) { \n");
} else {
- sb.append(" function " + methodName
- + "(form) { \n");
+ sb.append(" function " + methodName + "(form) { \n");
}
- sb.append(" if (bCancel) \n");
- sb.append(" return true; \n");
- sb.append(" else \n");
+ sb.append(" if (bCancel) { \n");
+ sb.append(" return true; \n");
+ sb.append(" } else { \n");
// Always return true if there aren't any Javascript validation methods
if ((methods == null) || (methods.length() == 0)) {
- sb.append(" return true; \n");
+ sb.append(" return true; \n");
} else {
- //Making Sure that Bitwise operator works:
- sb.append(" var formValidationResult;\n");
- sb.append(" formValidationResult = " + methods + "; \n");
- sb.append(" return (formValidationResult == 1);\n");
+ sb.append(" var formValidationResult; \n");
+ sb.append(" formValidationResult = " + methods + "; \n");
+ if (methods.indexOf("&&") >= 0) {
+ sb.append(" return (formValidationResult); \n");
+ } else {
+ //Making Sure that Bitwise operator works:
+ sb.append(" return (formValidationResult == 1); \n");
+ }
}
-
- sb.append(" } \n\n");
+ sb.append(" } \n");
+ sb.append(" } \n\n");
return sb.toString();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org