Added prioritize callback and enabled viewstate update on callback return.

1 files changed, 3 insertions, 31 deletions

diff --git a/framework/Web/UI/TPage.php b/framework/Web/UI/TPage.php
index 11ebc1dd..008b7c83 100644
--- a/framework/Web/UI/TPage.php
+++ b/framework/Web/UI/TPage.php
@@ -153,12 +153,7 @@ class TPage extends TTemplateControl
 	 * @var array post data loader IDs.

 	 */

 	private $_postDataLoaders=array();

-	/**

-	 * @var boolean true if callback request is allowed to update the client-

-	 * side contents during callback response.

-	 */

-	private $_allowCallbackUpdate=false;

-	

+

 	/**

 	 * Constructor.

 	 * Sets the page object to itself.

@@ -282,8 +277,6 @@ class TPage extends TTemplateControl
 		Prado::trace("Page initRecursive()",'System.Web.UI.TPage');

 		$this->initRecursive();

 

-		$this->setAllowCallbackUpdate(true);

-

 		Prado::trace("Page onInitComplete()",'System.Web.UI.TPage');

 		$this->onInitComplete(null);

 

@@ -316,11 +309,12 @@ class TPage extends TTemplateControl
 		Prado::trace("Page onPreRenderComplete()",'System.Web.UI.TPage');

 		$this->onPreRenderComplete(null);

 

-/*		Prado::trace("Page savePageState()",'System.Web.UI.TPage');

+		Prado::trace("Page savePageState()",'System.Web.UI.TPage');

 		$this->savePageState();

 		Prado::trace("Page onSaveStateComplete()",'System.Web.UI.TPage');

 		$this->onSaveStateComplete(null);

 

+/*

 		Prado::trace("Page renderControl()",'System.Web.UI.TPage');

 		$this->renderControl($writer);

 */

@@ -331,28 +325,6 @@ class TPage extends TTemplateControl
 	}

 	

 	/**

-	 * Returns true if callback request is allowed to update the client- side

-	 * contents during callback response. Default is true if {@link

-	 * getIsCallback IsCallback} is true and onInit stage has been completed.

-	 * @return boolean true to allow client-side update.

-	 */

-	public function getAllowCallbackUpdate()

-	{

-		return $this->_allowCallbackUpdate;

-	}

-	

-	/**

-	 * Set to true to allow callback request to update client-side content

-	 * during callback response. Default is true if {@link getIsCallback

-	 * IsCallback} is true and onInit stage has been completed.

-	 * @param boolean true to allow callback to update client-side content.

-	 */

-	public function setAllowCallbackUpdate($value)

-	{

-		$this->_allowCallbackUpdate = TPropertyValue::ensureBoolean($value);

-	}

-	

-	/**

 	 * Gets the callback client script handler that allows javascript functions

 	 * to be executed during the callback response. 

 	 * @return TCallbackClientScript interface to client-side javascript code.