From 9af56fd93ed071d86f14296cec618073f6c0941a Mon Sep 17 00:00:00 2001
From: wei <>
Date: Sat, 23 Sep 2006 01:08:19 +0000
Subject: Fixed #383

---
 framework/Web/Javascripts/js/compressed/ajax.js | 5 +++--
 framework/Web/Javascripts/js/debug/ajax.js      | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'framework/Web/Javascripts/js')

diff --git a/framework/Web/Javascripts/js/compressed/ajax.js b/framework/Web/Javascripts/js/compressed/ajax.js
index 6bbb7a7c..1686d86f 100644
--- a/framework/Web/Javascripts/js/compressed/ajax.js
+++ b/framework/Web/Javascripts/js/compressed/ajax.js
@@ -80,7 +80,7 @@ Ajax.Responders.register({onComplete:function(request)
 {if(request.options.HasPriority)
 Prado.CallbackRequest.abortRequestInProgress();}});Event.OnLoad(function()
 {if(typeof Logger!="undefined")
-Ajax.Responders.register(Prado.CallbackRequest.Exception);});Prado.CallbackRequest.prototype={url:window.location.href,options:{},id:null,request:null,initialize:function(id,options)
+Ajax.Responders.register(Prado.CallbackRequest.Exception);});Prado.CallbackRequest.prototype={url:window.location.href,options:{},id:null,request:null,Enabled:true,initialize:function(id,options)
 {this.id=id;this.options=Object.extend({RequestTimeOut:30000,EnablePageStateUpdate:true,HasPriority:true,CausesValidation:true,ValidationGroup:null,PostInputs:true},options||{});},setCallbackParameter:function(value)
 {this.options['params']=value;},getCallbackParameter:function()
 {return this.options['params'];},setRequestTimeOut:function(timeout)
@@ -95,7 +95,8 @@ tinyMCE.triggerSave();Object.extend(this.options,{postBody:this._getPostData(),p
 {var form=this.options.Form||Prado.Validation.getForm();if(Prado.Validation.validate(form,this.options.ValidationGroup,this)==false)
 return false;}
 if(this.options.onPreDispatch)
-this.options.onPreDispatch(this,null);if(this.options.HasPriority)
+this.options.onPreDispatch(this,null);if(!this.Enabled)
+return;if(this.options.HasPriority)
 return Prado.CallbackRequest.dispatchPriorityRequest(this);else
 return Prado.CallbackRequest.dispatchNormalRequest(this);},_getPostData:function()
 {var data={};var callback=Prado.CallbackRequest;if(this.options.PostInputs!=false)
diff --git a/framework/Web/Javascripts/js/debug/ajax.js b/framework/Web/Javascripts/js/debug/ajax.js
index a6c8db82..5bd22afa 100644
--- a/framework/Web/Javascripts/js/debug/ajax.js
+++ b/framework/Web/Javascripts/js/debug/ajax.js
@@ -655,6 +655,8 @@ Prado.CallbackRequest.prototype =
 	 */
 	request : null,
 
+	Enabled : true,
+
 	/**
 	 * Prepare and inititate a callback request.
 	 */
@@ -766,6 +768,9 @@ Prado.CallbackRequest.prototype =
 		if(this.options.onPreDispatch)
 			this.options.onPreDispatch(this,null);
 
+		if(!this.Enabled)
+			return;
+
 		if(this.options.HasPriority)
 			return Prado.CallbackRequest.dispatchPriorityRequest(this);
 		else
-- 
cgit v1.2.3