From 8313b3412e0db7262966a60b859093e6577abb46 Mon Sep 17 00:00:00 2001 From: xue <> Date: Tue, 17 Jul 2007 11:27:51 +0000 Subject: Fixed #670. --- HISTORY | 4 ++++ buildscripts/texbuilder/quickstart/quickstart.tex | 2 +- framework/PradoBase.php | 2 +- framework/Web/Javascripts/source/prado/datepicker/datepicker.js | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/HISTORY b/HISTORY index 146bca85..cdeff6a7 100644 --- a/HISTORY +++ b/HISTORY @@ -1,3 +1,7 @@ +Version 3.1.1 To be released +============================ +BUG: Ticket#670 - TDatePicker: Year Issue (Christophe) + Version 3.1.0 July 2, 2007 ========================== BUG: Ticket#621 - TWizardNavigationButtonStyle could not be found (Qiang) diff --git a/buildscripts/texbuilder/quickstart/quickstart.tex b/buildscripts/texbuilder/quickstart/quickstart.tex index ed2db536..923b47ca 100644 --- a/buildscripts/texbuilder/quickstart/quickstart.tex +++ b/buildscripts/texbuilder/quickstart/quickstart.tex @@ -52,7 +52,7 @@ %----------------- TITLE -------------- -\title{\Huge \bfseries PRADO v3.1.0 Quickstart Tutorial +\title{\Huge \bfseries PRADO v3.1.1 Quickstart Tutorial \thanks{Copyright 2005-2007. All Rights Reserved.} } \author{Qiang Xue and Wei Zhuo} 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) -- cgit v1.2.3