From d042fed88e7ed55e2a7deee037c8073e6c545290 Mon Sep 17 00:00:00 2001
From: "Christophe.Boulain" <>
Date: Wed, 8 Apr 2009 07:06:36 +0000
Subject: Fixed Issue#136

---
 .../Javascripts/source/prado/activecontrols/activedatepicker.js    | 3 ++-
 framework/Web/UI/ActiveControls/TActiveDatePicker.php              | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'framework')

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);
-		}
+	//	}
 	}
 }
 ?>
-- 
cgit v1.2.3