Author: mrdon Date: Thu Jul 6 22:01:19 2006 New Revision: 419804 URL: http://svn.apache.org/viewvc?rev=419804&view=rev Log: Removing duplicate regex validator, now that it has been removed from XWork WW-1288
Modified: struts/struts2/trunk/core/src/main/resources/template/xhtml/form-close-validate.ftl Modified: struts/struts2/trunk/core/src/main/resources/template/xhtml/form-close-validate.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/form-close-validate.ftl?rev=419804&r1=419803&r2=419804&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/resources/template/xhtml/form-close-validate.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/template/xhtml/form-close-validate.ftl Thu Jul 6 22:01:19 2006 @@ -57,11 +57,6 @@ addError(field, error); errors = true; } - <#elseif validator.validatorType = "stringregex"> - if (field.value != null && field.value.match(/${validator.regex}/)==null) { - addError(field, error); - errors = true; - } <#elseif validator.validatorType = "email"> if (field.value != null && field.value.length > 0 && field.value.match(/\b(^[_A-Za-z0-9-]+(\.[_A-Za-z0-9-]+)*@([A-Za-z0-9-])+(\.[A-Za-z0-9-]+)*((\.[A-Za-z0-9]{2,})|(\.[A-Za-z0-9]{2,}\.[A-Za-z0-9]{2,}))$)\b/gi)==null) { addError(field, error);