diff options
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/PradoBase.php | 2 | ||||
| -rw-r--r-- | framework/Web/Javascripts/source/prado/datepicker/datepicker.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/framework/PradoBase.php b/framework/PradoBase.php index f8d8ec81..9f6d91a0 100644 --- a/framework/PradoBase.php +++ b/framework/PradoBase.php @@ -66,7 +66,7 @@ class PradoBase */
public static function getVersion()
{
- return '3.1.0';
+ return '3.1.1';
}
/**
diff --git a/framework/Web/Javascripts/source/prado/datepicker/datepicker.js b/framework/Web/Javascripts/source/prado/datepicker/datepicker.js index 6dddeaad..ade26d26 100644 --- a/framework/Web/Javascripts/source/prado/datepicker/datepicker.js +++ b/framework/Web/Javascripts/source/prado/datepicker/datepicker.js @@ -473,7 +473,7 @@ Prado.WebUI.TDatePicker.prototype = date = new Date();
if(typeof(date) == "string" || typeof(date) == "number")
date = new Date(date);
- return new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0,0,0);
+ return new Date(Math.min(Math.max(date.getFullYear(),this.FromYear),this.UpToYear), date.getMonth(), date.getDate(), 0,0,0);
},
setSelectedDate : function(date)
|