summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Bas <ctrlaltca@gmail.com>2013-11-21 13:43:12 +0100
committerFabio Bas <ctrlaltca@gmail.com>2013-11-25 19:00:01 +0100
commit99a8784827a320659e8f17ba33e71f2dfb3ef03f (patch)
tree7b6e5f8d114b0db6e9ccd2a0f26702676dc932b8
parent6d7ac281324719b48df690e9d4b4b8e432147b2c (diff)
Fixed a bug in TDatePicker rendering an unused TTextBox
-rwxr-xr-xframework/Web/UI/ActiveControls/TActiveDatePicker.php2
-rw-r--r--framework/Web/UI/WebControls/TDatePicker.php6
2 files changed, 3 insertions, 5 deletions
diff --git a/framework/Web/UI/ActiveControls/TActiveDatePicker.php b/framework/Web/UI/ActiveControls/TActiveDatePicker.php
index bfac83a0..279739a8 100755
--- a/framework/Web/UI/ActiveControls/TActiveDatePicker.php
+++ b/framework/Web/UI/ActiveControls/TActiveDatePicker.php
@@ -139,7 +139,7 @@ class TActiveDatePicker extends TDatePicker implements ICallbackEventHandler, I
$cs->registerPradoScript("activedatepicker");
}
- protected function registerCalendarClientScriptPost()
+ protected function renderClientControlScript($writer)
{
$cs = $this->getPage()->getClientScript();
if(!$cs->isEndScriptRegistered('TDatePicker.spacer'))
diff --git a/framework/Web/UI/WebControls/TDatePicker.php b/framework/Web/UI/WebControls/TDatePicker.php
index a67997b8..0e8d7bda 100644
--- a/framework/Web/UI/WebControls/TDatePicker.php
+++ b/framework/Web/UI/WebControls/TDatePicker.php
@@ -436,7 +436,7 @@ class TDatePicker extends TTextBox
$this->renderDropDownListCalendar($writer);
if($this->hasDayPattern())
{
- $this->registerCalendarClientScriptPost();
+ $this->renderClientControlScript($writer);
$this->renderDatePickerButtons($writer);
}
}
@@ -858,10 +858,8 @@ class TDatePicker extends TTextBox
{
parent::addAttributesToRender($writer);
$writer->addAttribute('id',$this->getClientID());
- $this->registerCalendarClientScriptPost();
}
-
/**
* Registers the javascript code to initialize the date picker.
*/
@@ -874,7 +872,7 @@ class TDatePicker extends TTextBox
}
}
- protected function registerCalendarClientScriptPost()
+ protected function renderClientControlScript($writer)
{
if($this->getShowCalendar())
{