From 93c4193f4a3c315c7785bf5f9f522c955ef6fce7 Mon Sep 17 00:00:00 2001
From: wei <>
Date: Sat, 5 Aug 2006 00:38:30 +0000
Subject: Fixed #274

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

(limited to 'framework/Web/Javascripts')

diff --git a/framework/Web/Javascripts/js/validator.js b/framework/Web/Javascripts/js/validator.js
index ee578ea2..0e39d191 100644
--- a/framework/Web/Javascripts/js/validator.js
+++ b/framework/Web/Javascripts/js/validator.js
@@ -125,7 +125,11 @@ return value;},getValidationValue:function(control)
 control=this.control
 switch(this.options.ControlType)
 {case'TDatePicker':if(control.type=="text")
-return this.trim($F(control));else
+{value=this.trim($F(control));if(this.options.DateFormat)
+{date=value.toDate(this.options.DateFormat);return date==null?'':date;}
+else
+return value;}
+else
 {this.observeDatePickerChanges();return Prado.WebUI.TDatePicker.getDropDownDate(control).getTime();}
 case'THtmlArea':if(typeof tinyMCE!="undefined")
 tinyMCE.triggerSave();return this.trim($F(control));case'TRadioButton':if(this.options.GroupName)
diff --git a/framework/Web/Javascripts/prado/validation3.js b/framework/Web/Javascripts/prado/validation3.js
index f5f058c8..b1b20722 100644
--- a/framework/Web/Javascripts/prado/validation3.js
+++ b/framework/Web/Javascripts/prado/validation3.js
@@ -767,7 +767,17 @@ Prado.WebUI.TBaseValidator.prototype =
 	 	{
 	 		case 'TDatePicker':
 	 			if(control.type == "text")
-	 				return this.trim($F(control));
+	 			{
+	 				value = this.trim($F(control));
+	 				
+	 				if(this.options.DateFormat)
+	 				{
+	 					date = value.toDate(this.options.DateFormat);
+	 					return date == null ? '' : date;
+	 				}
+	 				else
+		 				return value;
+	 			}
 	 			else
 	 			{
 	 				this.observeDatePickerChanges();
-- 
cgit v1.2.3