merge from 3.0 branch till 1363.

1 files changed, 6 insertions, 6 deletions

diff --git a/framework/Web/Javascripts/prado/validation3.js b/framework/Web/Javascripts/prado/validation3.js
index 86659323..c88aa661 100644
--- a/framework/Web/Javascripts/prado/validation3.js
+++ b/framework/Web/Javascripts/prado/validation3.js
@@ -785,10 +785,10 @@ Prado.WebUI.TBaseValidator.prototype =
 	 			{

 	 				value = this.trim($F(control));

 

-	 				if(this.options.DateFormat)

+					if(this.options.DateFormat)

 	 				{

 	 					date = value.toDate(this.options.DateFormat);

-	 					return date == null ? '' : date;

+	 					return date == null ? value : date;

 	 				}

 	 				else

 		 				return value;

@@ -1281,10 +1281,10 @@ Prado.WebUI.TDataTypeValidator = Class.extend(Prado.WebUI.TBaseValidator,
 {

         evaluateIsValid : function()

         {

-                var value = this.getValidationValue();

-                if(value.length <= 0)

-                        return true;

-                return this.convert(this.options.DataType, value) != null;

+			value = this.getValidationValue();

+			if(value.length <= 0)

+				return true;

+            return this.convert(this.options.DataType, value) != null;

         }

 });