From 145c4aef09e278d29bfd8e9858e114ca097e5901 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sat, 18 Feb 2006 07:24:51 +0000
Subject: client script reorganization.

---
 framework/Web/UI/WebControls/TDatePicker.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 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 fd280938..a70e25b3 100644
--- a/framework/Web/UI/WebControls/TDatePicker.php
+++ b/framework/Web/UI/WebControls/TDatePicker.php
@@ -228,7 +228,8 @@ class TDatePicker extends TTextBox
 	{
 		$options['Format'] = $this->getDateFormat();
 		$options['FirstDayOfWeek'] = $this->getFirstDayOfWeek();
-		$options['ClassName'] = $this->getCssClass();
+		if(($cssClass=$this->getCssClass())!=='')
+			$options['ClassName'] = $cssClass;
 		$options['FromYear'] = $this->getFromYear();
 		$options['UpToYear'] = $this->getUpToYear();
 		if($this->getMode()!=='Basic')
@@ -252,10 +253,8 @@ class TDatePicker extends TTextBox
 		Prado::using('System.I18N.core.DateTimeFormatInfo');
 		$info = Prado::createComponent('System.I18N.core.CultureInfo', $culture);
 		$date = $info->getDateTimeFormat();
-		$serializer = new TJavascriptSerializer($date->getMonthNames());
-		$options['MonthNames'] = $serializer->toList();
-		$serializer = new TJavascriptSerializer($date->getAbbreviatedDayNames());
-		$options['ShortWeekDayNames'] = $serializer->toList();
+		$options['MonthNames'] = TJavaScript::encode($date->getMonthNames(),false);
+		$options['ShortWeekDayNames'] = TJavaScript::encode($date->getAbbreviatedDayNames(),false);
 		return $options;
 	}
 
@@ -367,9 +366,8 @@ class TDatePicker extends TTextBox
 		if($this->getShowCalendar())
 		{
 			$scripts = $this->getPage()->getClientScript();
-			$scripts->registerClientScript("datepicker");
-			$serializer = new TJavascriptSerializer($this->getDatePickerOptions());
-			$options = $serializer->toJavascript();
+			$scripts->registerPradoScript("datepicker");
+			$options = TJavaScript::encode($this->getDatePickerOptions());
 			$id = $this->getClientID();
 			$code = "Event.OnLoad(function(){ new Prado.WebUI.TDatePicker('$id', $options); });";
 			$scripts->registerEndScript("prado:$id", $code);
-- 
cgit v1.2.3