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 2005/09/21 21:40:30 UTC
svn commit: r290800 - in /jakarta/tapestry/trunk: ./
framework/src/java/org/apache/tapestry/valid/
Author: hlship
Date: Wed Sep 21 12:40:24 2005
New Revision: 290800
URL: http://svn.apache.org/viewcvs?rev=290800&view=rev
Log:
TAPESTRY-649: ValidField component creates javascript referencing handle_invalid_field() method that no longer exists
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/DateValidator.script
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/EmailValidator.script
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/IntegerValidator.script
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/NumberValidator.script
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/PatternValidator.script
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/StringValidator.script
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/UrlValidator.script
jakarta/tapestry/trunk/status.xml
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/DateValidator.script
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/DateValidator.script?rev=290800&r1=290799&r2=290800&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/DateValidator.script (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/DateValidator.script Wed Sep 21 12:40:24 2005
@@ -47,7 +47,7 @@
var field = document.${form.name}.${field.name};
if (field.value.length == 0)
- handle_invalid_field(event, field, "${requiredMessage}");
+ event.invalid_field(field, "${requiredMessage}");
}
</body>
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/EmailValidator.script
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/EmailValidator.script?rev=290800&r1=290799&r2=290800&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/EmailValidator.script (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/EmailValidator.script Wed Sep 21 12:40:24 2005
@@ -56,7 +56,7 @@
<if expression="validator.required">
if (strValue.length == 0)
{
- handle_invalid_field(event, field, "${requiredMessage}");
+ event.invalid_field(field, "${requiredMessage}");
return;
}
</if>
@@ -69,14 +69,14 @@
<if expression="validator.minimumLength">
if (strValue.length < ${validator.minimumLength})
{
- handle_invalid_field(event, field, "${minimumLengthMessage}");
+ event.invalid_field(field, "${minimumLengthMessage}");
return;
}
</if>
atIndex = strValue.indexOf("@");
if ((atIndex == -1) || (atIndex == 0) || (atIndex == strValue.length -1))
- handle_invalid_field(event, field, "${emailFormatMessage}");
+ event.invalid_field(field, "${emailFormatMessage}");
}
</body>
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/IntegerValidator.script
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/IntegerValidator.script?rev=290800&r1=290799&r2=290800&view=diff
==============================================================================
Binary files - no diff available.
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/NumberValidator.script
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/NumberValidator.script?rev=290800&r1=290799&r2=290800&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/NumberValidator.script (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/NumberValidator.script Wed Sep 21 12:40:24 2005
@@ -52,7 +52,7 @@
<if expression="validator.required">
if (stringValue.length == 0)
{
- handle_invalid_field(event, field, "${requiredMessage}");
+ event.invalid_field(field, "${requiredMessage}");
return;
}
</if>
@@ -63,28 +63,28 @@
var value = stringValue * 1;
if (isNaN(value))
{
- handle_invalid_field(event, field, "${formatMessage}");
+ event.invalid_field(field, "${formatMessage}");
return;
}
<if expression="validator.integerNumber">
var regex = /\./;
if (stringValue.search(regex) != -1)
{
- handle_invalid_field(event, field, "${formatMessage}");
+ event.invalid_field(field, "${formatMessage}");
return;
}
</if>
<if expression="validator.minimum != null">
if (value < ${validator.minimum})
{
- handle_invalid_field(event, field, "${rangeMessage}");
+ event.invalid_field(field, "${rangeMessage}");
return;
}
</if>
<if expression="validator.maximum != null">
if (value > ${validator.maximum})
{
- handle_invalid_field(event, field, "${rangeMessage}");
+ event.invalid_field(field, "${rangeMessage}");
return;
}
</if>
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/PatternValidator.script
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/PatternValidator.script?rev=290800&r1=290799&r2=290800&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/PatternValidator.script (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/PatternValidator.script Wed Sep 21 12:40:24 2005
@@ -53,12 +53,12 @@
<if expression="validator.required">
if (field.value.length == 0)
{
- handle_invalid_field(event, field, "${requiredMessage}");
+ event.invalid_field(field, "${requiredMessage}");
return;
}
</if>
if (field.value.length > 0 && !${pattern}.test(field.value))
- handle_invalid_field(event, field, "${patternNotMatchedMessage}");
+ event.invalid_field(field, "${patternNotMatchedMessage}");
}
</body>
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/StringValidator.script
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/StringValidator.script?rev=290800&r1=290799&r2=290800&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/StringValidator.script (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/StringValidator.script Wed Sep 21 12:40:24 2005
@@ -49,7 +49,7 @@
<if expression="validator.required">
if (field.value.length == 0)
{
- handle_invalid_field(event, field, "${requiredMessage}");
+ event.invalid_field(field, "${requiredMessage}");
return;
}
</if>
@@ -61,7 +61,7 @@
<if expression="validator.minimumLength">
if (field.value.length < ${validator.minimumLength})
{
- handle_invalid_field(event, field, "${minimumLengthMessage}");
+ event.invalid_field(field, "${minimumLengthMessage}");
return;
}
</if>
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/UrlValidator.script
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/UrlValidator.script?rev=290800&r1=290799&r2=290800&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/UrlValidator.script (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/UrlValidator.script Wed Sep 21 12:40:24 2005
@@ -48,12 +48,12 @@
<body>
-<unique>
+<unique><![CDATA[
function regexpTestUrl(sUrl) {
var regexp = /(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/
return regexp.test(sUrl);
}
-</unique>
+]]></unique>
function ${function}(event) {
var field = document.${form.name}.${field.name};
@@ -62,7 +62,7 @@
<if expression="validator.required">
if (strValue.length == 0)
- return handle_invalid_field(event, field, "${requiredMessage}");
+ return event.invalid_field(field, "${requiredMessage}");
</if>
<if-not expression="validator.required">
@@ -72,16 +72,16 @@
<if expression="validator.minimumLength">
if (strValue.length < ${validator.minimumLength})
- return handle_invalid_field(event, field, "${minimumLengthMessage}");
+ return event.invalid_field(field, "${minimumLengthMessage}");
</if>
if(!regexpTestUrl(strValue))
- return handle_invalid_field(event, field, "${urlFormatMessage}");
+ return event.invalid_field(field, "${urlFormatMessage}");
<if expression="null != urlRegexpProtocols">
var protoRegExp = ${urlRegexpProtocols};
if(!protoRegExp.test(strValue))
- return handle_invalid_field(event, field, "${urlDisallowedProtocolMessage}");
+ return event.invalid_field(field, "${urlDisallowedProtocolMessage}");
</if>
}
</body>
Modified: jakarta/tapestry/trunk/status.xml
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/status.xml?rev=290800&r1=290799&r2=290800&view=diff
==============================================================================
--- jakarta/tapestry/trunk/status.xml (original)
+++ jakarta/tapestry/trunk/status.xml Wed Sep 21 12:40:24 2005
@@ -55,6 +55,7 @@
<action type="fix" dev="MB" fixes-bug="TAPESTRY-654">Foreach and For cache the 'source' parameter even when they should not</action>
<action type="fix" dev="DS" fixes-bug="TAPESTRY-473">Document ListEdit component</action>
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-653">InspectorButton component renders poorly</action>
+ <action type="fix" dev="HLS" fixes-bug="TAPESTRY-649">ValidField component creates javascript referencing handle_invalid_field() method that no longer exists</action>
</release>
<release version="4.0-beta-7" date="Sep 17 2005">
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-341">Need better line-precise reporting for listener method</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org