You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2004/03/09 18:15:17 UTC
cvs commit: jakarta-tapestry/framework/src/org/apache/tapestry/valid EmailValidator.script
hlship 2004/03/09 09:15:17
Modified: framework/src/org/apache/tapestry/valid
EmailValidator.script
Log:
[27202] inverted logic in clientside EmailValidator.script
Revision Changes Path
1.4 +16 -15 jakarta-tapestry/framework/src/org/apache/tapestry/valid/EmailValidator.script
Index: EmailValidator.script
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/valid/EmailValidator.script,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EmailValidator.script 1 Jun 2003 05:05:12 -0000 1.3
+++ EmailValidator.script 9 Mar 2004 17:15:17 -0000 1.4
@@ -3,19 +3,19 @@
<!DOCTYPE script PUBLIC
"-//Apache Software Foundation//Tapestry Script Specification 3.0//EN"
"http://jakarta.apache.org/tapestry/dtd/Script_3_0.dtd">
-
-<!--
+
+<!--
Creates a script for validating that a field is required and/or has a minimum
field length.
-
+
Input symbols:
field, form, validator: As normal for a validation script.
requiredMessage: Message to display if the field is required yet blank.
minimumLengthMessage: Message to display if the field length is too short.
-
+
-->
-
+
<script>
<include-script resource-path="/org/apache/tapestry/valid/Validator.js"/>
@@ -34,25 +34,26 @@
<body>
function ${function}()
{
- var field = document.${form.name}.${field.name};
-
- strValue = field.value.replace(/ /g,"");
-
+ var field = document.${form.name}.${field.name};
+
+ strValue = field.value.replace(/ /g,"");
+
field.value = strValue;
<if expression="validator.required">
if (strValue.length == 0)
return validator_invalid_field(field, "${requiredMessage}");
</if>
-<if expression="validator.minimumLength">
- if (strValue.length < ${validator.minimumLength})
- return validator_invalid_field(field, "${minimumLengthMessage}");
-</if>
<if-not expression="validator.required">
- if (strValue.length == 0)
+ if (strValue.length == 0)
return true;
</if-not>
+
+<if expression="validator.minimumLength">
+ if (strValue.length < ${validator.minimumLength})
+ return validator_invalid_field(field, "${minimumLengthMessage}");
+</if>
atIndex = strValue.indexOf("@");
if ((atIndex == -1) || (atIndex == 0) || (atIndex == strValue.length -1))
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org