From 6228873cf9d6471463d2413e7dfd7447f759baf2 Mon Sep 17 00:00:00 2001
From: "christophe.boulain" <>
Date: Wed, 3 Dec 2008 14:22:03 +0000
Subject: Merge from trunk

---
 framework/Web/UI/ActiveControls/TActiveControlAdapter.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'framework/Web/UI/ActiveControls/TActiveControlAdapter.php')

diff --git a/framework/Web/UI/ActiveControls/TActiveControlAdapter.php b/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
index 88e4fdfe..34872f98 100644
--- a/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
+++ b/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
@@ -4,7 +4,7 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id$
  * @package System.Web.UI.ActiveControls
@@ -97,7 +97,7 @@ class TActiveControlAdapter extends TControlAdapter
 			$data = $this->getPage()->getPostDataLoaders();
 			if(count($data) > 0)
 			{
-				$options = TJavascript::encode($data,false);
+				$options = TJavaScript::encode($data,false);
 				$script = "Prado.CallbackRequest.addPostLoaders({$options});";
 				$cs->registerEndScript($key, $script);
 			}
@@ -146,12 +146,12 @@ class TActiveControlAdapter extends TControlAdapter
 	 * Starts viewstate tracking if necessary after when controls has been loaded
 	 */
 	public function onLoad($param)
-	{
+	{
 		if($this->getIsTrackingPageState())
 		{
 			$this->_stateTracker = new TCallbackPageStateTracker($this->getControl());
 			$this->_stateTracker->trackChanges();
-		}
+		}
 		parent::onLoad($param);
 	}
 
@@ -560,4 +560,3 @@ class TMapCollectionDiff extends TViewStateDiff
 	}
 }
 
-?>
-- 
cgit v1.2.3