summaryrefslogtreecommitdiff
path: root/framework/Web/Javascripts/source
diff options
context:
space:
mode:
authortof <>2008-04-21 07:48:05 +0000
committertof <>2008-04-21 07:48:05 +0000
commit5b04db7e35212829257cd679eb66c3bf138d72db (patch)
tree9d74df873df1892cb118f077e8a44493afa03b80 /framework/Web/Javascripts/source
parent60a4991e9bd37457cafc6f3a19fd83f8c71ef3b0 (diff)
Fixed #718
Diffstat (limited to 'framework/Web/Javascripts/source')
-rw-r--r--framework/Web/Javascripts/source/prado/activecontrols/ajax3.js25
1 files changed, 22 insertions, 3 deletions
diff --git a/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js b/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js
index 001007d7..18cbb3f9 100644
--- a/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js
+++ b/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js
@@ -612,14 +612,33 @@ Prado.CallbackRequest.prototype = Object.extend(Prado.AjaxRequest.prototype,
if(!this.Enabled)
return;
-
+
+ // Opera don't have onLoading/onLoaded state, so, simulate them just
+ // before sending the request.
+ if (Prototype.Browser.Opera)
+ {
+ if (this.ActiveControl.onLoading)
+ {
+ this.ActiveControl.onLoading(this,null);
+ Ajax.Responders.dispatch('onLoading',this, this.transport,null);
+ }
+ if (this.ActiveControl.onLoaded)
+ {
+ this.ActiveControl.onLoaded(this,null);
+ Ajax.Responders.dispatch('onLoaded',this, this.transport,null);
+ }
+ }
+
+ var result;
if(this.ActiveControl.HasPriority)
{
- return Prado.CallbackRequest.enqueue(this);
+ result = Prado.CallbackRequest.enqueue(this);
//return Prado.CallbackRequest.dispatchPriorityRequest(this);
}
else
- return Prado.CallbackRequest.dispatchNormalRequest(this);
+ result = Prado.CallbackRequest.dispatchNormalRequest(this);
+
+ return result;
},
abort : function()