From 0f332e6564ed67ef7eb4d715ce3bcb5ff54c50cf Mon Sep 17 00:00:00 2001
From: Ciro Mattia Gonano <ciromattia@gmail.com>
Date: Wed, 24 Jul 2013 12:22:49 +0200
Subject: Upgrade to newly released 3.2.2

---
 framework/Web/Javascripts/TJavaScript.php                       | 8 ++++----
 framework/Web/Javascripts/source/prado/prado.js                 | 2 +-
 framework/Web/Javascripts/source/prado/scriptaculous-adapter.js | 5 ++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'framework/Web/Javascripts')

diff --git a/framework/Web/Javascripts/TJavaScript.php b/framework/Web/Javascripts/TJavaScript.php
index 7f4733a2..0f6fef1c 100644
--- a/framework/Web/Javascripts/TJavaScript.php
+++ b/framework/Web/Javascripts/TJavaScript.php
@@ -6,7 +6,7 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2013 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TJavaScript.php 3245 2013-01-07 20:23:32Z ctrlaltca $
+ * @version $Id: TJavaScript.php 3291 2013-05-09 17:44:58Z ctrlaltca $
  * @package System.Web.Javascripts
  */
 
@@ -17,7 +17,7 @@
  * functions.
  *
  * @author Wei Zhuo<weizhuo[at]gmail[dot]com>
- * @version $Id: TJavaScript.php 3245 2013-01-07 20:23:32Z ctrlaltca $
+ * @version $Id: TJavaScript.php 3291 2013-05-09 17:44:58Z ctrlaltca $
  * @package System.Web.Javascripts
  * @since 3.0
  */
@@ -219,7 +219,7 @@ class TJavaScript
 			($g=Prado::getApplication()->getGlobalization(false))!==null &&
 			strtoupper($enc=$g->getCharset())!='UTF-8')
 			$value=iconv($enc, 'UTF-8', $value);
-		$s = json_encode($value,$options);
+		$s = @json_encode($value,$options);
 		self::checkJsonError();
 		return $s;
 	}
@@ -234,7 +234,7 @@ class TJavaScript
 	 */
 	public static function jsonDecode($value, $assoc = false, $depth = 512)
 	{
-		$s= json_decode($value, $assoc, $depth);
+		$s= @json_decode($value, $assoc, $depth);
 		self::checkJsonError();
 		return $s;
 	}
diff --git a/framework/Web/Javascripts/source/prado/prado.js b/framework/Web/Javascripts/source/prado/prado.js
index 36a08426..b827b125 100644
--- a/framework/Web/Javascripts/source/prado/prado.js
+++ b/framework/Web/Javascripts/source/prado/prado.js
@@ -8,7 +8,7 @@ var Prado =
 	 * Version of Prado clientscripts
 	 * @var Version
 	 */
-	Version: '3.2.1',
+	Version: '3.2.2',
 	
 	/**
 	 * Registry for Prado components
diff --git a/framework/Web/Javascripts/source/prado/scriptaculous-adapter.js b/framework/Web/Javascripts/source/prado/scriptaculous-adapter.js
index 3c186d3e..febe6ad9 100644
--- a/framework/Web/Javascripts/source/prado/scriptaculous-adapter.js
+++ b/framework/Web/Javascripts/source/prado/scriptaculous-adapter.js
@@ -202,6 +202,9 @@ Prado.PostBack = function(event,options)
 	/*if(options['StopEvent']) */
 		Event.stop(event);
 	Event.fireEvent(form,"submit");
+
+	$('PRADO_POSTBACK_TARGET').value = '';
+	$('PRADO_POSTBACK_PARAMETER').value = '';
 };
 
 /**
@@ -283,7 +286,7 @@ Prado.Element =
 	{
 		var el = $(element);
 		if(!el) return;
-		if((attribute == "disabled" || attribute == "multiple" || attribute == "readonly") && value==false)
+		if((attribute == "disabled" || attribute == "multiple" || attribute == "readonly" || attribute == "href") && value==false)
 			el.removeAttribute(attribute);
 		else if(attribute.match(/^on/i)) //event methods
 		{
-- 
cgit v1.2.3