Fixed #360

9 files changed, 53 insertions, 13 deletions

diff --git a/.gitattributes b/.gitattributes
index a04e48b2..c7b40e30 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1899,6 +1899,8 @@ tests/FunctionalTests/active-controls/protected/pages/ActiveListBoxMasterTest.pa
 tests/FunctionalTests/active-controls/protected/pages/ActiveListBoxMasterTest.php -text
 tests/FunctionalTests/active-controls/protected/pages/ActiveListBoxTest.page -text
 tests/FunctionalTests/active-controls/protected/pages/ActiveListBoxTest.php -text
+tests/FunctionalTests/active-controls/protected/pages/ActivePanelVisibleTest.page -text
+tests/FunctionalTests/active-controls/protected/pages/ActivePanelVisibleTest.php -text
 tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonListTest.page -text
 tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonListTest.php -text
 tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonTest.page -text
diff --git a/framework/Web/Javascripts/js/compressed/ajax.js b/framework/Web/Javascripts/js/compressed/ajax.js
index 88a0a4b0..93bcbaac 100644
--- a/framework/Web/Javascripts/js/compressed/ajax.js
+++ b/framework/Web/Javascripts/js/compressed/ajax.js
@@ -39,9 +39,9 @@ return Prado.CallbackRequest.decode(json);}}});Prado.CallbackRequest=Class.creat
 list.push(id);});this.PostDataLoaders=list;},dispatchActions:function(transport,actions)
 {if(actions&&actions.length>0)
 actions.each(this.__run.bind(this,transport));},__run:function(transport,command)
-{for(var method in command)
+{this.trasport=transport;for(var method in command)
 {try
-{method.toFunction().apply(this,command[method].concat(transport));}
+{method.toFunction().apply(this,command[method]);}
 catch(e)
 {if(typeof(Logger)!="undefined")
 Prado.CallbackRequest.Exception.onException(null,e);}}},Exception:{"on500":function(request,transport,data)
diff --git a/framework/Web/Javascripts/js/compressed/prado.js b/framework/Web/Javascripts/js/compressed/prado.js
index e565d59a..2f6f7eed 100644
--- a/framework/Web/Javascripts/js/compressed/prado.js
+++ b/framework/Web/Javascripts/js/compressed/prado.js
@@ -240,7 +240,7 @@ if(month==2)
 else{if(date>28){return null;}}}
 if((month==4)||(month==6)||(month==9)||(month==11))
 {if(date>30){return null;}}
-var newdate=new Date(year,month-1,date,0,0,0);return newdate;}});var Prado={Version:'3.0.0',Browser:function()
+var newdate=new Date(year,month-1,date,0,0,0);return newdate;}});var Prado={Version:'3.1',Browser:function()
 {var info={Version:"1.0"};var is_major=parseInt(navigator.appVersion);info.nver=is_major;info.ver=navigator.appVersion;info.agent=navigator.userAgent;info.dom=document.getElementById?1:0;info.opera=window.opera?1:0;info.ie5=(info.ver.indexOf("MSIE 5")>-1&&info.dom&&!info.opera)?1:0;info.ie6=(info.ver.indexOf("MSIE 6")>-1&&info.dom&&!info.opera)?1:0;info.ie4=(document.all&&!info.dom&&!info.opera)?1:0;info.ie=info.ie4||info.ie5||info.ie6;info.mac=info.agent.indexOf("Mac")>-1;info.ns6=(info.dom&&parseInt(info.ver)>=5)?1:0;info.ie3=(info.ver.indexOf("MSIE")&&(is_major<4));info.hotjava=(info.agent.toLowerCase().indexOf('hotjava')!=-1)?1:0;info.ns4=(document.layers&&!info.dom&&!info.hotjava)?1:0;info.bw=(info.ie6||info.ie5||info.ie4||info.ns4||info.ns6||info.opera);info.ver3=(info.hotjava||info.ie3);info.opera7=((info.agent.toLowerCase().indexOf('opera 7')>-1)||(info.agent.toLowerCase().indexOf('opera/7')>-1));info.operaOld=info.opera&&!info.opera7;return info;},ImportCss:function(doc,css_file)
 {if(Prado.Browser().ie)
 var styleSheet=doc.createStyleSheet(css_file);else
@@ -275,9 +275,9 @@ el.setAttribute(attribute,value);},setOptions:function(element,options)
 {el.options.length=options.length;for(var i=0;i<options.length;i++)
 el.options[i]=new Option(options[i][0],options[i][1]);}},focus:function(element)
 {var obj=$(element);if(typeof(obj)!="undefined"&&typeof(obj.focus)!="undefined")
-setTimeout(function(){obj.focus();},100);return false;},replace:function(element,method,content,boundary,transport)
+setTimeout(function(){obj.focus();},100);return false;},replace:function(element,method,content,boundary)
 {if(boundary)
-{result=Prado.Element.extractContent(transport.responseText,boundary);if(result!=null)
+{result=Prado.Element.extractContent(this.transport.responseText,boundary);if(result!=null)
 content=result;}
 if(typeof(element)=="string")
 {if($(element))
diff --git a/framework/Web/Javascripts/js/debug/ajax.js b/framework/Web/Javascripts/js/debug/ajax.js
index 9835e7e8..8359309f 100644
--- a/framework/Web/Javascripts/js/debug/ajax.js
+++ b/framework/Web/Javascripts/js/debug/ajax.js
@@ -431,11 +431,12 @@ Object.extend(Prado.CallbackRequest,
 	 */

 	__run : function(transport, command)

 	{

+		this.trasport = transport;

 		for(var method in command)

 		{

 			try

 			{

-				method.toFunction().apply(this,command[method].concat(transport));

+				method.toFunction().apply(this,command[method]);

 			}

 			catch(e)

 			{

diff --git a/framework/Web/Javascripts/js/debug/prado.js b/framework/Web/Javascripts/js/debug/prado.js
index c890ccdb..122a5640 100644
--- a/framework/Web/Javascripts/js/debug/prado.js
+++ b/framework/Web/Javascripts/js/debug/prado.js
@@ -599,7 +599,8 @@ Template.prototype = {
 /**

  * @class String extensions

  */

-Object.extend(String.prototype, {

+Object.extend(String.prototype, 

+{

 	/**

 	 * @param {String} "left" to pad the string on the left, "right" to pad right.

 	 * @param {Number} minimum string length.

@@ -2660,7 +2661,7 @@ Object.extend(Date,
 

 var Prado =

 {

-	Version: '3.0.0',

+	Version: '3.1',

 

 	/**

 	 * Returns browser information. Example

@@ -3000,11 +3001,11 @@ Prado.Element =
 		return false;

 	},

 

-	replace : function(element, method, content, boundary, transport)

+	replace : function(element, method, content, boundary)

 	{

 		if(boundary)

 		{

-			result = Prado.Element.extractContent(transport.responseText, boundary);

+			result = Prado.Element.extractContent(this.transport.responseText, boundary);

 			if(result != null)

 				content = result;

 		}

diff --git a/framework/Web/Javascripts/prado/ajax3.js b/framework/Web/Javascripts/prado/ajax3.js
index 397382f3..6a304caa 100644
--- a/framework/Web/Javascripts/prado/ajax3.js
+++ b/framework/Web/Javascripts/prado/ajax3.js
@@ -143,11 +143,12 @@ Object.extend(Prado.CallbackRequest,
 	 */

 	__run : function(transport, command)

 	{

+		this.trasport = transport;

 		for(var method in command)

 		{

 			try

 			{

-				method.toFunction().apply(this,command[method].concat(transport));

+				method.toFunction().apply(this,command[method]);

 			}

 			catch(e)

 			{

diff --git a/framework/Web/Javascripts/prado/element.js b/framework/Web/Javascripts/prado/element.js
index d234e71b..867bbec6 100644
--- a/framework/Web/Javascripts/prado/element.js
+++ b/framework/Web/Javascripts/prado/element.js
@@ -74,11 +74,11 @@ Prado.Element =
 		return false;

 	},

 

-	replace : function(element, method, content, boundary, transport)

+	replace : function(element, method, content, boundary)

 	{

 		if(boundary)

 		{

-			result = Prado.Element.extractContent(transport.responseText, boundary);

+			result = Prado.Element.extractContent(this.transport.responseText, boundary);

 			if(result != null)

 				content = result;

 		}

diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActivePanelVisibleTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActivePanelVisibleTest.page
new file mode 100644
index 00000000..0795e46b
--- /dev/null
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActivePanelVisibleTest.page
@@ -0,0 +1,17 @@
+<com:TForm>

+

+<h1>ActivePanel Visible Test</h1>

+

+<com:TActiveRadioButton ID="rbA" Checked="true"

+    GroupName="group1" Text="Show A" OnCallback="showA"/>

+

+<com:TActiveRadioButton ID="tbB"

+    GroupName="group1" Text="Show B" OnCallback="showB"/>

+

+<com:TActivePanel ID="pnlA">foo</com:TActivePanel>

+

+<com:TActivePanel ID="pnlB">bar</com:TActivePanel>

+

+<com:TJavascriptLogger />

+

+</com:TForm>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActivePanelVisibleTest.php b/tests/FunctionalTests/active-controls/protected/pages/ActivePanelVisibleTest.php
new file mode 100644
index 00000000..e922319e
--- /dev/null
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActivePanelVisibleTest.php
@@ -0,0 +1,18 @@
+<?php

+

+class ActivePanelVisibleTest extends TPage

+{

+	public function showA()

+	{

+    	$this->pnlB->Visible = false;

+    	$this->pnlA->Visible = true;

+    }

+

+    public function showB()

+    {

+    	$this->pnlB->Visible = true;

+    	$this->pnlA->Visible = false;

+    }

+}

+

+?>
\ No newline at end of file