summaryrefslogtreecommitdiff
path: root/framework/Web
diff options
context:
space:
mode:
authortof <>2008-03-13 11:21:20 +0000
committertof <>2008-03-13 11:21:20 +0000
commitbbd920258f436b5c1ff3c151f01f03089fbc24ad (patch)
treec6c0a51ed30c380bce764f815f84e665fd2b6fd5 /framework/Web
parent074c13520bfc8c29a43acf201329f06158868829 (diff)
Fixed ajax3.js.
Sorry for theses commits, but I didn't realize the replaced files was so old :(
Diffstat (limited to 'framework/Web')
-rw-r--r--framework/Web/Javascripts/source/packages.php4
-rw-r--r--framework/Web/Javascripts/source/prado/activecontrols/ajax3.js12
2 files changed, 9 insertions, 7 deletions
diff --git a/framework/Web/Javascripts/source/packages.php b/framework/Web/Javascripts/source/packages.php
index 79333884..748732e5 100644
--- a/framework/Web/Javascripts/source/packages.php
+++ b/framework/Web/Javascripts/source/packages.php
@@ -62,9 +62,6 @@ $packages = array(
'prado/controls/tabpanel.js'
),
- 'maskedtextbox'=>array(
- 'prado/controls/maskedtextbox.js'
- ),
);
@@ -81,7 +78,6 @@ $dependencies = array(
'slider' => array('prado', 'slider'),
'keyboard' => array('prado', 'keyboard'),
'tabpanel' => array('prado', 'tabpanel'),
- 'maskedtextbox' => array('prado', 'maskedtextbox'),
);
return array($packages, $dependencies);
diff --git a/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js b/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js
index 2ec9eab1..001007d7 100644
--- a/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js
+++ b/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js
@@ -230,7 +230,10 @@ Object.extend(Prado.CallbackRequest,
"on500" : function(request, transport, data)
{
var e = request.getHeaderData(Prado.CallbackRequest.ERROR_HEADER);
- Logger.error("Callback Server Error "+e.code, this.formatException(e));
+ if (e)
+ Logger.error("Callback Server Error "+e.code, this.formatException(e));
+ else
+ Logger.error("Callback Server Error Unknown",'');
},
/**
@@ -430,8 +433,11 @@ Object.extend(Prado.CallbackRequest,
*/
Ajax.Responders.register({onComplete : function(request)
{
- if(request.ActiveControl.HasPriority)
- Prado.CallbackRequest.tryNextRequest();
+ if(request && request instanceof Prado.AjaxRequest)
+ {
+ if(request.ActiveControl.HasPriority)
+ Prado.CallbackRequest.tryNextRequest();
+ }
}});
//Add HTTP exception respones when logger is enabled.