Author: lukaszlenart Date: Thu Jan 3 10:32:30 2013 New Revision: 1428270 URL: http://svn.apache.org/viewvc?rev=1428270&view=rev Log: WW-3892 adds support to specify expression, caseSensitive and trim params as expressions
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=1428270&r1=1428269&r2=1428270&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 Jan 3 10:32:30 2013 @@ -85,7 +85,7 @@ END SNIPPET: supported-validators <#if validator.shortCircuit>continueValidation = false;</#if> } <#elseif validator.validatorType = "email"> - if (continueValidation && field.value != null && field.value.length > 0 && field.value.match("${validator.expression}")==null) { + if (continueValidation && field.value != null && field.value.length > 0 && field.value.match("${validator.expression?js_string}")==null) { addError(field, error); errors = true; <#if validator.shortCircuit>continueValidation = false;</#if>