From da895b1c97234c9640d94bef0e2027b9fc8a6a66 Mon Sep 17 00:00:00 2001 From: wei <> Date: Tue, 29 Aug 2006 13:41:36 +0000 Subject: Fixing ticket #274 --- framework/Web/Javascripts/js/compressed/validator.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'framework/Web/Javascripts/js/compressed/validator.js') diff --git a/framework/Web/Javascripts/js/compressed/validator.js b/framework/Web/Javascripts/js/compressed/validator.js index cecc6881..d3d8c53e 100644 --- a/framework/Web/Javascripts/js/compressed/validator.js +++ b/framework/Web/Javascripts/js/compressed/validator.js @@ -127,7 +127,7 @@ control=this.control switch(this.options.ControlType) {case'TDatePicker':if(control.type=="text") {value=this.trim($F(control));if(this.options.DateFormat) -{date=value.toDate(this.options.DateFormat);return date==null?'':date;} +{date=value.toDate(this.options.DateFormat);return date==null?value:date;} else return value;} else @@ -201,5 +201,5 @@ return false;required.each(function(requiredValue) var min=typeof(this.options.Min)=="undefined"?Number.NEGATIVE_INFINITY:this.options.Min;var max=typeof(this.options.Max)=="undefined"?Number.POSITIVE_INFINITY:this.options.Max;return exists&&checked>=min&&checked<=max;},getRequiredValues:function() {var required=[];if(this.options.Required&&this.options.Required.length>0) required=this.options.Required.split(/,\s*/);return required;}});Prado.WebUI.TDataTypeValidator=Class.extend(Prado.WebUI.TBaseValidator,{evaluateIsValid:function() -{var value=this.getValidationValue();if(value.length<=0) +{value=this.getValidationValue();if(value.length<=0) return true;return this.convert(this.options.DataType,value)!=null;}}); \ No newline at end of file -- cgit v1.2.3