From 15f6747485b5912f657c2c0fce8f41c01c70d2ad Mon Sep 17 00:00:00 2001
From: "ctrlaltca@gmail.com" <>
Date: Fri, 24 Jun 2011 22:12:36 +0000
Subject: merged in the patch for progressive rendering from #235; unit tests
 doesn't evidence any regression, but of course more proper testing is needed

---
 framework/Web/UI/ActiveControls/TActiveControlAdapter.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(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 e8f947af..99c5e71e 100644
--- a/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
+++ b/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
@@ -75,6 +75,15 @@ class TActiveControlAdapter extends TControlAdapter
 			$this->_activeControlType = $type;
 	}
 
+ 	/**
+	 * Publish the ajax script
+	 */
+	public function onPreRender($param)
+	{
+		parent::onPreRender($param);
+		$this->getPage()->getClientScript()->registerPradoScript('ajax');
+	}
+
 	/**
 	 * Renders the callback client scripts.
 	 */
@@ -93,7 +102,6 @@ class TActiveControlAdapter extends TControlAdapter
 		$key = 'Prado.CallbackRequest.addPostLoaders';
 		if(!$cs->isEndScriptRegistered($key))
 		{
-			$cs->registerPradoScript('ajax');
 			$data = $this->getPage()->getPostDataLoaders();
 			if(count($data) > 0)
 			{
-- 
cgit v1.2.3