From e0c9de073cce5b5c9975694c03e2dbe63788bd66 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sat, 29 Jul 2006 14:43:53 +0000
Subject: Merge from 3.0 branch till 1305.

---
 framework/Web/Javascripts/js/validator.js      |  6 +++++-
 framework/Web/Javascripts/prado/validation3.js | 19 ++++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

(limited to 'framework/Web/Javascripts')

diff --git a/framework/Web/Javascripts/js/validator.js b/framework/Web/Javascripts/js/validator.js
index 8869ab9e..5e896aa1 100644
--- a/framework/Web/Javascripts/js/validator.js
+++ b/framework/Web/Javascripts/js/validator.js
@@ -175,7 +175,11 @@ return true;switch(this.options.Operator)
 return true;}});Prado.WebUI.TRangeValidator=Class.extend(Prado.WebUI.TBaseValidator,{evaluateIsValid:function()
 {var value=this.getValidationValue();if(value.length<=0)
 return true;if(typeof(this.options.DataType)=="undefined")
-this.options.DataType="String";var min=this.convert(this.options.DataType,this.options.MinValue||null);var max=this.convert(this.options.DataType,this.options.MaxValue||null);value=this.convert(this.options.DataType,value);if(value==null)
+this.options.DataType="String";if(this.options.DataType!="StringLength")
+{var min=this.convert(this.options.DataType,this.options.MinValue||null);var max=this.convert(this.options.DataType,this.options.MaxValue||null);value=this.convert(this.options.DataType,value);}
+else
+{var min=this.options.MinValue||0;var max=this.options.MaxValue||Number.POSITIVE_INFINITY;value=value.length;}
+if(value==null)
 return false;var valid=true;if(min!=null)
 valid=valid&&value>=min;if(max!=null)
 valid=valid&&value<=max;return valid;}});Prado.WebUI.TRegularExpressionValidator=Class.extend(Prado.WebUI.TBaseValidator,{evaluateIsValid:function()
diff --git a/framework/Web/Javascripts/prado/validation3.js b/framework/Web/Javascripts/prado/validation3.js
index 9535f8c5..1dba23da 100644
--- a/framework/Web/Javascripts/prado/validation3.js
+++ b/framework/Web/Javascripts/prado/validation3.js
@@ -1113,11 +1113,20 @@ Prado.WebUI.TRangeValidator = Class.extend(Prado.WebUI.TBaseValidator,
 			return true;
 		if(typeof(this.options.DataType) == "undefined")
 			this.options.DataType = "String";
-
-		var min = this.convert(this.options.DataType, this.options.MinValue || null);
-		var max = this.convert(this.options.DataType, this.options.MaxValue || null);
-		value = this.convert(this.options.DataType, value);
-
+		
+		if(this.options.DataType != "StringLength")
+		{
+			var min = this.convert(this.options.DataType, this.options.MinValue || null);
+			var max = this.convert(this.options.DataType, this.options.MaxValue || null);
+			value = this.convert(this.options.DataType, value);
+		}
+		else
+		{
+			var min = this.options.MinValue || 0;
+			var max = this.options.MaxValue || Number.POSITIVE_INFINITY;
+			value = value.length;
+		}
+		
 		if(value == null)
 			return false;
 
-- 
cgit v1.2.3