summaryrefslogtreecommitdiff
path: root/framework/Web
diff options
context:
space:
mode:
authorFabio Bas <ctrlaltca@gmail.com>2016-02-20 13:27:38 +0100
committerFabio Bas <ctrlaltca@gmail.com>2016-02-20 13:27:38 +0100
commitcdaa6d7f9773a1613777f348cdd652527f086b05 (patch)
tree8c9b127602fbac29bfe8a36044a3762362147271 /framework/Web
parent55c7e9c4cd967620ec468309d18f41c53f23dfee (diff)
Fix callback for controls with PostState=false
When PostState=false, always send at least the page state <com:TActiveButton ActiveControl.ClientSide.PostState="false" />
Diffstat (limited to 'framework/Web')
-rw-r--r--framework/Web/Javascripts/source/prado/activecontrols/ajax3.js9
1 files changed, 7 insertions, 2 deletions
diff --git a/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js b/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js
index 7ca7e181..4b6a4d2a 100644
--- a/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js
+++ b/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js
@@ -280,7 +280,6 @@ Prado.CallbackRequest = jQuery.klass(Prado.PostBack,
*/
getParameters : function()
{
- var form = this.getForm();
var data = {};
if(typeof(this.options.CallbackParameter) != "undefined")
@@ -289,9 +288,15 @@ Prado.CallbackRequest = jQuery.klass(Prado.PostBack,
data[Prado.CallbackRequestManager.FIELD_CALLBACK_TARGET] = this.options.EventTarget;
if(this.options.PostInputs != false)
+ {
+ var form = this.getForm();
return jQuery(form).serialize() + '&' + jQuery.param(data);
- else
+ } else {
+ var pagestate = jQuery("#"+Prado.CallbackRequestManager.FIELD_CALLBACK_PAGESTATE);
+ if(pagestate)
+ data[Prado.CallbackRequestManager.FIELD_CALLBACK_PAGESTATE] = pagestate.val();
return jQuery.param(data);
+ }
},
/**