diff options
| author | Christophe.Boulain <> | 2009-04-08 07:06:36 +0000 |
|---|---|---|
| committer | Christophe.Boulain <> | 2009-04-08 07:06:36 +0000 |
| commit | d042fed88e7ed55e2a7deee037c8073e6c545290 (patch) | |
| tree | 00709c8d5b8283c676d8edc4e308c3aefc8d210d /framework | |
| parent | bd2d05119734a7892485cfe3c7bc62a4a606ce6d (diff) | |
Fixed Issue#136
Diffstat (limited to 'framework')
| -rwxr-xr-x | framework/Web/Javascripts/source/prado/activecontrols/activedatepicker.js | 3 | ||||
| -rwxr-xr-x | framework/Web/UI/ActiveControls/TActiveDatePicker.php | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/framework/Web/Javascripts/source/prado/activecontrols/activedatepicker.js b/framework/Web/Javascripts/source/prado/activecontrols/activedatepicker.js index 87b48bf3..3aacda21 100755 --- a/framework/Web/Javascripts/source/prado/activecontrols/activedatepicker.js +++ b/framework/Web/Javascripts/source/prado/activecontrols/activedatepicker.js @@ -33,7 +33,8 @@ Prado.WebUI.TActiveDatePicker = Class.extend(Prado.WebUI.TDatePicker, Object.extend(this,options); - Event.observe(this.trigger, triggerEvent, this.show.bindEvent(this)); + if (this.options.ShowCalendar) + Event.observe(this.trigger, triggerEvent, this.show.bindEvent(this)); // Listen to change event if(this.options.InputMode == "TextBox") diff --git a/framework/Web/UI/ActiveControls/TActiveDatePicker.php b/framework/Web/UI/ActiveControls/TActiveDatePicker.php index 052ed199..4ef43198 100755 --- a/framework/Web/UI/ActiveControls/TActiveDatePicker.php +++ b/framework/Web/UI/ActiveControls/TActiveDatePicker.php @@ -39,6 +39,7 @@ class TActiveDatePicker extends TDatePicker implements ICallbackEventHandler, I protected function getDatePickerOptions(){ $options = parent::getDatePickerOptions(); $options['EventTarget'] = $this->getUniqueID(); + $options['ShowCalendar'] = $this->getShowCalendar(); return $options; } @@ -108,8 +109,8 @@ class TActiveDatePicker extends TDatePicker implements ICallbackEventHandler, I */ protected function registerCalendarClientScript() { - if($this->getShowCalendar()) - { + // if($this->getShowCalendar()) + // { $cs = $this->getPage()->getClientScript(); $cs->registerPradoScript("activedatepicker"); @@ -123,7 +124,7 @@ class TActiveDatePicker extends TDatePicker implements ICallbackEventHandler, I $options = TJavaScript::encode($this->getDatePickerOptions()); $code = "new Prado.WebUI.TActiveDatePicker($options);"; $cs->registerEndScript("prado:".$this->getClientID(), $code); - } + // } } } ?> |