From cf0b1bc0ca5610543ca7402a0293aa54d52a8e55 Mon Sep 17 00:00:00 2001
From: wei <>
Date: Mon, 26 Mar 2007 07:14:23 +0000
Subject: rearrange js builder and update UI components to reflect moved js
 libraries

---
 framework/Web/UI/TClientScriptManager.php     | 2 --
 framework/Web/UI/WebControls/TColorPicker.php | 4 ++--
 framework/Web/UI/WebControls/TDatePicker.php  | 8 ++++----
 3 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'framework/Web/UI')

diff --git a/framework/Web/UI/TClientScriptManager.php b/framework/Web/UI/TClientScriptManager.php
index a5876cff..edb0f742 100644
--- a/framework/Web/UI/TClientScriptManager.php
+++ b/framework/Web/UI/TClientScriptManager.php
@@ -82,11 +82,9 @@ class TClientScriptManager extends TApplicationComponent
 	private static $_pradoScripts=array(
 		'prado'			=> array('prado'),
 		'effects'		=> array('prado', 'effects'),
-		'ajax'			=> array('prado', 'effects', 'ajax'),
 		'validator'		=> array('prado', 'validator'),
 		'logger'		=> array('prado', 'logger'),
 		'datepicker'	=> array('prado', 'datepicker'),
-		'rico'			=> array('prado', 'effects', 'ajax', 'rico'),
 		'colorpicker'	=> array('prado', 'colorpicker')
 		);
 
diff --git a/framework/Web/UI/WebControls/TColorPicker.php b/framework/Web/UI/WebControls/TColorPicker.php
index e9e1de00..e1178cb1 100644
--- a/framework/Web/UI/WebControls/TColorPicker.php
+++ b/framework/Web/UI/WebControls/TColorPicker.php
@@ -143,7 +143,7 @@ class TColorPicker extends TTextBox
 	protected function publishColorPickerStyle()
 	{
 		$cs = $this->getPage()->getClientScript();
-		$style = 'System.Web.Javascripts.colorpicker.'.$this->getColorPickerStyle();
+		$style = 'System.Web.Javascripts.prado.colorpicker.'.$this->getColorPickerStyle();
 		if(($cssFile=Prado::getPathOfNamespace($style,'.css'))!==null)
 		{
 			$url = $this->publishFilePath($cssFile);
@@ -172,7 +172,7 @@ class TColorPicker extends TTextBox
 
 		foreach($images as $filename => $ext)
 		{
-			$image = 'System.Web.Javascripts.colorpicker.'.$filename;
+			$image = 'System.Web.Javascripts.prado.colorpicker.'.$filename;
 			if(($file =  Prado::getPathOfNamespace($image, $ext))!==null)
 				$list[$filename.$ext] = $this->publishFilePath($file);
 			else
diff --git a/framework/Web/UI/WebControls/TDatePicker.php b/framework/Web/UI/WebControls/TDatePicker.php
index b435324d..99d45770 100644
--- a/framework/Web/UI/WebControls/TDatePicker.php
+++ b/framework/Web/UI/WebControls/TDatePicker.php
@@ -619,7 +619,7 @@ class TDatePicker extends TTextBox
 	{
 		$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',
 						$this->getDateFormat());
-		$days = array(); 
+		$days = array();
 		$requiresPadding = $formatter->getDayPattern() === 'dd';
 		for($i=1;$i<=31;$i++)
 		{
@@ -737,7 +737,7 @@ class TDatePicker extends TTextBox
 	 */
 	protected function publishDefaultButtonImage()
 	{
-		$image = 'System.Web.Javascripts.datepicker.calendar';
+		$image = 'System.Web.Javascripts.prado.datepicker.calendar';
 		if(($file =  Prado::getPathOfNamespace($image, '.png'))!==null)
 			return $this->publishFilePath($file);
 		else
@@ -751,7 +751,7 @@ class TDatePicker extends TTextBox
 	protected function publishCalendarStyle()
 	{
 		$cs = $this->getPage()->getClientScript();
-		$style = 'System.Web.Javascripts.datepicker.'.$this->getCalendarStyle();
+		$style = 'System.Web.Javascripts.prado.datepicker.'.$this->getCalendarStyle();
 		if(($cssFile=Prado::getPathOfNamespace($style,'.css'))!==null)
 		{
 			$url = $this->publishFilePath($cssFile);
@@ -770,7 +770,7 @@ class TDatePicker extends TTextBox
 	protected function publishIFrameSpacer()
 	{
 		$cs = $this->getPage()->getClientScript();
-		$spacer = 'System.Web.Javascripts.datepicker.spacer';
+		$spacer = 'System.Web.Javascripts.prado.datepicker.spacer';
 		if(($file = Prado::getPathOfNamespace($spacer,'.gif')) != null)
 			return $this->publishFilePath($file);
 	}
-- 
cgit v1.2.3