Author: igorz
Date: 2008-01-21 04:29:02 -0500 (Mon, 21 Jan 2008)
New Revision: 93372
Modified:
trunk/mcs/class/System.Web/resources/ChangeLog
trunk/mcs/class/System.Web/resources/WebUIValidation_2.0.js
Log:
2008-01-21 Igor Zelmanovich <[EMAIL PROTECTED]>
* WebUIValidation_2.0.js:
fixed CompareValidatorEvaluateIsValid.
works correctly with operator="datatypecheck"
Modified: trunk/mcs/class/System.Web/resources/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/resources/ChangeLog 2008-01-21 08:38:15 UTC
(rev 93371)
+++ trunk/mcs/class/System.Web/resources/ChangeLog 2008-01-21 09:29:02 UTC
(rev 93372)
@@ -1,3 +1,9 @@
+2008-01-21 Igor Zelmanovich <[EMAIL PROTECTED]>
+
+ * WebUIValidation_2.0.js:
+ fixed CompareValidatorEvaluateIsValid.
+ works correctly with operator="datatypecheck"
+
2008-01-13 Igor Zelmanovich <[EMAIL PROTECTED]>
* webform.js:
Modified: trunk/mcs/class/System.Web/resources/WebUIValidation_2.0.js
===================================================================
--- trunk/mcs/class/System.Web/resources/WebUIValidation_2.0.js 2008-01-21
08:38:15 UTC (rev 93371)
+++ trunk/mcs/class/System.Web/resources/WebUIValidation_2.0.js 2008-01-21
09:29:02 UTC (rev 93372)
@@ -380,18 +380,24 @@
webForm.ValidatorSucceeded (validator);
return true;
}
- var compare = "";
- if (typeof(validator.controltocompare) == "string" &&
document.getElementById(validator.controltocompare))
- compare =
webForm.ValidatorTrim(webForm.ValidatorGetValue(validator.controltocompare));
- else if (typeof(validator.valuetocompare) == "string")
- compare = validator.valuetocompare;
-
+
var left = webForm.Convert (ctrl_value, DataType, validator);
if (left == null) {
webForm.ValidatorFailed (validator);
return false;
}
+
+ if (Operator == "datatypecheck") {
+ webForm.ValidatorSucceeded (validator);
+ return true;
+ }
+ var compare = null;
+ if (typeof(validator.controltocompare) == "string" &&
document.getElementById(validator.controltocompare))
+ compare =
webForm.ValidatorTrim(webForm.ValidatorGetValue(validator.controltocompare));
+ else if (typeof(validator.valuetocompare) == "string")
+ compare = validator.valuetocompare;
+
var right = compare != null ? webForm.Convert (compare, DataType,
validator) : null;
if (right == null) {
webForm.ValidatorSucceeded (validator);
@@ -579,4 +585,4 @@
}
-}
\ No newline at end of file
+}
_______________________________________________
Mono-patches maillist - Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches
