From b97ece103198be2ff3dc1a259588fb849266534b Mon Sep 17 00:00:00 2001
From: ctrlaltca <>
Date: Tue, 22 Jan 2013 22:43:34 +0000
Subject: merged r3261, r3262 to trunk/

---
 framework/Web/UI/TClientScriptManager.php | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'framework/Web/UI/TClientScriptManager.php')

diff --git a/framework/Web/UI/TClientScriptManager.php b/framework/Web/UI/TClientScriptManager.php
index 39cab493..cab002e4 100644
--- a/framework/Web/UI/TClientScriptManager.php
+++ b/framework/Web/UI/TClientScriptManager.php
@@ -769,14 +769,6 @@ abstract class TClientSideOptions extends TComponent
 	 */
 	private $_options;
 
-	/**
-	 * Constructor, initialize the options list.
-	 */
-	public function __construct()
-	{
-		$this->_options = Prado::createComponent('System.Collections.TMap');
-	}
-
 	/**
 	 * Adds on client-side event handler by wrapping the code within a
 	 * javascript function block. If the code begins with "javascript:", the
@@ -797,7 +789,10 @@ abstract class TClientSideOptions extends TComponent
 	 */
 	protected function getOption($name)
 	{
-		return $this->_options->itemAt($name);
+		if ($this->_options)
+			return $this->_options->itemAt($name);
+		else
+			return null;
 	}
 
 	/**
@@ -806,7 +801,7 @@ abstract class TClientSideOptions extends TComponent
 	 */
 	protected function setOption($name, $value)
 	{
-		$this->_options->add($name, $value);
+		$this->getOptions()->add($name, $value);
 	}
 
 	/**
@@ -814,6 +809,8 @@ abstract class TClientSideOptions extends TComponent
 	 */
 	public function getOptions()
 	{
+		if (!$this->_options)
+			$this->_options = Prado::createComponent('System.Collections.TMap');
 		return $this->_options;
 	}
 
-- 
cgit v1.2.3