From 855f259df29d8685201390ee4d79af3931ef1b3c Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Tue, 26 Aug 2014 16:45:02 +0200
Subject: Regenerated pradolite;

---
 framework/pradolite.php | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/framework/pradolite.php b/framework/pradolite.php
index dfe5e1d2..a01c3f98 100644
--- a/framework/pradolite.php
+++ b/framework/pradolite.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * File Name: pradolite.php
- * Last Update: 2013/11/26 10:04:34
+ * Last Update: 2014/08/26 16:44:14
  * Generated By: buildscripts/phpbuilder/build.php
  *
  * This file is used in lieu of prado.php to boost PRADO application performance.
@@ -25,7 +25,7 @@ class PradoBase
 	protected static $classExists = array();
 	public static function getVersion()
 	{
-		return '3.2.3';
+		return '3.2.4';
 	}
 	public static function initErrorHandlers()
 	{
@@ -2393,7 +2393,7 @@ class TXmlDocument extends TXmlElement
 	{
 		return $this->saveToString();
 	}
-	private function buildElement($node)
+	protected function buildElement($node)
 	{
 		$element=new TXmlElement($node->tagName);
 		$element->setValue($node->nodeValue);
@@ -2895,14 +2895,23 @@ class TJavaScript
 	}
 	public static function jsonEncode($value, $options = 0)
 	{
-		if (is_string($value) &&
-			($g=Prado::getApplication()->getGlobalization(false))!==null &&
-			strtoupper($enc=$g->getCharset())!='UTF-8')
-			$value=iconv($enc, 'UTF-8', $value);
+		if (($g=Prado::getApplication()->getGlobalization(false))!==null &&
+			strtoupper($enc=$g->getCharset())!='UTF-8') {
+			self::convertToUtf8($value, $enc);
+		}
 		$s = @json_encode($value,$options);
 		self::checkJsonError();
 		return $s;
 	}
+	private static function convertToUtf8(&$value, $sourceEncoding) {
+		if(is_string($value))
+			$value=iconv($sourceEncoding, 'UTF-8', $value);
+		else if (is_array($value))
+		{
+			foreach($value as &$element)
+				self::convertToUtf8($element, $sourceEncoding);
+		}
+	}
 	public static function jsonDecode($value, $assoc = false, $depth = 512)
 	{
 		$s= @json_decode($value, $assoc, $depth);
@@ -4524,7 +4533,7 @@ class TControl extends TApplicationComponent implements IRenderable, IBindable
 	const IS_DISABLE_THEMING=0x10;
 	const IS_CHILD_CREATED=0x20;
 	const IS_CREATING_CHILD=0x40;
-	const RF_CONTROLS=0;				const RF_CHILD_STATE=1;				const RF_NAMED_CONTROLS=2;			const RF_NAMED_CONTROLS_ID=3;		const RF_SKIN_ID=4;					const RF_DATA_BINDINGS=5;			const RF_EVENTS=6;					const RF_CONTROLSTATE=7;			const RF_NAMED_OBJECTS=8;			const RF_ADAPTER=9;					const RF_AUTO_BINDINGS=10;
+	const RF_CONTROLS=0;				const RF_CHILD_STATE=1;				const RF_NAMED_CONTROLS=2;			const RF_NAMED_CONTROLS_ID=3;		const RF_SKIN_ID=4;					const RF_DATA_BINDINGS=5;			const RF_EVENTS=6;					const RF_CONTROLSTATE=7;			const RF_NAMED_OBJECTS=8;			const RF_ADAPTER=9;					const RF_AUTO_BINDINGS=10;		
 	private $_id='';
 	private $_uid;
 	private $_parent;
@@ -7089,7 +7098,7 @@ class TClientScriptManager extends TApplicationComponent
 		if($target instanceof TControl)
 			$target=$target->getClientID();
 		$id = TJavaScript::quoteString($target);
-		$this->_endScripts['prado:focus'] = 'new Effect.ScrollTo('.$id.'); Prado.Element.focus('.$id.');';
+		$this->_endScripts['prado:focus'] = 'Prado.Element.focus('.$id.');';
 		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript','registerFocusControl',$params);
 	}
@@ -7281,8 +7290,11 @@ class TClientScriptManager extends TApplicationComponent
 	}
 	public function flushScriptFiles($writer, $control=null)
 	{
-		$this->_page->ensureRenderInForm($control);
-		$this->renderAllPendingScriptFiles($writer);
+		if(!$this->_page->getIsCallback())
+		{
+			$this->_page->ensureRenderInForm($control);
+			$this->renderAllPendingScriptFiles($writer);
+		}
 	}
 	protected function renderHiddenFieldsInt($writer, $initial)
  	{
@@ -7465,6 +7477,9 @@ class TPage extends TTemplateControl
 	{
 		Prado::using('System.Web.UI.ActiveControls.TActivePageAdapter');
 		$this->setAdapter(new TActivePageAdapter($this));
+        $callbackEventParameter = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
+        if(strlen($callbackEventParameter) > 0)
+            $this->_postData[TPage::FIELD_CALLBACK_PARAMETER]=TJavaScript::jsonDecode((string)$callbackEventParameter);
                 if (($g=$this->getApplication()->getGlobalization(false))!==null &&
             strtoupper($enc=$g->getCharset())!='UTF-8')
                 foreach ($this->_postData as $k=>$v)
@@ -11152,3 +11167,4 @@ class TShellApplication extends TApplication
 		$this->initApplication();
 	}
 }
+?>
\ No newline at end of file
-- 
cgit v1.2.3