client script reorganization.

1 files changed, 3 insertions, 5 deletions

diff --git a/framework/Web/UI/WebControls/TColorPicker.php b/framework/Web/UI/WebControls/TColorPicker.php
index c0cc3ae7..fda6bced 100644
--- a/framework/Web/UI/WebControls/TColorPicker.php
+++ b/framework/Web/UI/WebControls/TColorPicker.php
@@ -168,8 +168,7 @@ class TColorPicker extends TTextBox
 		}

 		$imgs['button.gif'] = $list['button.gif'];

 		$imgs['background.png'] = $list['background.png'];

-		$serializer = new TJavascriptSerializer($imgs);

-		$options = $serializer->toJavascript();

+		$options = TJavaScript::encode($imgs);

 		$code = "Prado.WebUI.TColorPicker.UIImages = {$options};";

 		$cs->registerEndScript($key, $code);

 		return $list;

@@ -186,9 +185,8 @@ class TColorPicker extends TTextBox
 		parent::addAttributesToRender($writer);

 		$writer->addAttribute('id',$this->getClientID());

 		$scripts = $this->getPage()->getClientScript();

-		$scripts->registerClientScript("colorpicker");

-		$serializer = new TJavascriptSerializer($this->getColorPickerOptions());

-		$options = $serializer->toJavascript();

+		$scripts->registerPradoScript("colorpicker");

+		$options = TJavaScript::encode($this->getColorPickerOptions());

 		$id = $this->getClientID();

 		$code = "Event.OnLoad(function(){ new Prado.WebUI.TColorPicker($options); });";

 		$scripts->registerEndScript("prado:$id", $code);