From 3069eaf35e833ffe4a1c1c7829dd7e168ae27420 Mon Sep 17 00:00:00 2001 From: Ciro Mattia Gonano Date: Wed, 11 Sep 2013 15:56:48 +0200 Subject: Merge up to r3319 --- framework/Web/UI/WebControls/TDatePicker.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'framework/Web/UI/WebControls/TDatePicker.php') diff --git a/framework/Web/UI/WebControls/TDatePicker.php b/framework/Web/UI/WebControls/TDatePicker.php index f2448fcc..a67997b8 100644 --- a/framework/Web/UI/WebControls/TDatePicker.php +++ b/framework/Web/UI/WebControls/TDatePicker.php @@ -6,7 +6,7 @@ * @link http://www.pradosoft.com/ * @copyright Copyright © 2005-2013 PradoSoft * @license http://www.pradosoft.com/license/ - * @version $Id: TDatePicker.php 3245 2013-01-07 20:23:32Z ctrlaltca $ + * @version $Id: TDatePicker.php 3318 2013-09-04 14:04:51Z ctrlaltca $ * @package System.Web.UI.WebControls */ @@ -73,7 +73,7 @@ Prado::using('System.Web.UI.WebControls.TTextBox'); * * @author Wei Zhuo * @author Carl G. Mathisen - * @version $Id: TDatePicker.php 3245 2013-01-07 20:23:32Z ctrlaltca $ + * @version $Id: TDatePicker.php 3318 2013-09-04 14:04:51Z ctrlaltca $ * @package System.Web.UI.WebControls * @since 3.0 */ @@ -774,10 +774,10 @@ class TDatePicker extends TTextBox $years[$i] = $i; $writer->addAttribute('id', $this->getClientID().TControl::CLIENT_ID_SEPARATOR.'year'); $writer->addAttribute('name', $this->getUniqueID().TControl::ID_SEPARATOR.'year'); + $writer->addAttribute('class', 'datepicker_year_options'); if($this->getReadOnly() || !$this->getEnabled(true)) $writer->addAttribute('disabled', 'disabled'); $writer->renderBeginTag('select'); - $writer->addAttribute('class', 'datepicker_year_options'); $this->renderDropDownListOptions($writer, $years, $selected); $writer->renderEndTag(); } @@ -906,7 +906,7 @@ class TDatePicker extends TTextBox * as parameter to this event * * @author Wei Zhuo - * @version $Id: TDatePicker.php 3245 2013-01-07 20:23:32Z ctrlaltca $ + * @version $Id: TDatePicker.php 3318 2013-09-04 14:04:51Z ctrlaltca $ * @package System.Web.UI.WebControls * @since 3.0.4 */ @@ -940,7 +940,7 @@ class TDatePickerClientScript extends TClientSideOptions * - DropDownList: dropdown lists are used to pick up date values * * @author Qiang Xue - * @version $Id: TDatePicker.php 3245 2013-01-07 20:23:32Z ctrlaltca $ + * @version $Id: TDatePicker.php 3318 2013-09-04 14:04:51Z ctrlaltca $ * @package System.Web.UI.WebControls * @since 3.0.4 */ @@ -962,7 +962,7 @@ class TDatePickerInputMode extends TEnumerable * - ImageButton: Shows an image next to the text input, clicking on the image shows the date picker, * * @author Qiang Xue - * @version $Id: TDatePicker.php 3245 2013-01-07 20:23:32Z ctrlaltca $ + * @version $Id: TDatePicker.php 3318 2013-09-04 14:04:51Z ctrlaltca $ * @package System.Web.UI.WebControls * @since 3.0.4 */ -- cgit v1.2.3