summaryrefslogtreecommitdiff
path: root/framework/Web
diff options
context:
space:
mode:
Diffstat (limited to 'framework/Web')
-rw-r--r--framework/Web/Javascripts/js/compressed/ajax.js18
-rw-r--r--framework/Web/Javascripts/js/debug/ajax.js24
-rw-r--r--framework/Web/Javascripts/prado/ajax3.js24
3 files changed, 33 insertions, 33 deletions
diff --git a/framework/Web/Javascripts/js/compressed/ajax.js b/framework/Web/Javascripts/js/compressed/ajax.js
index f0516df5..a907ad3d 100644
--- a/framework/Web/Javascripts/js/compressed/ajax.js
+++ b/framework/Web/Javascripts/js/compressed/ajax.js
@@ -36,7 +36,7 @@ this.transport.onreadystatechange=Prototype.emptyFunction;},getHeaderData:functi
{var json=this.header(name);return eval('('+json+')');}
catch(e)
{if(typeof(json)=="string")
-return Prado.CallbackRequest.decode(json);}}});Prado.CallbackRequest=Class.create();Object.extend(Prado.CallbackRequest,{FIELD_CALLBACK_TARGET:'PRADO_CALLBACK_TARGET',FIELD_CALLBACK_PARAMETER:'PRADO_CALLBACK_PARAMETER',FIELD_CALLBACK_PAGESTATE:'PRADO_PAGESTATE',FIELD_POSTBACK_TARGET:'PRADO_POSTBACK_TARGET',FIELD_POSTBACK_PARAMETER:'PRADO_POSTBACK_PARAMETER',PostDataLoaders:[],DATA_HEADER:'X-PRADO-DATA',ACTION_HEADER:'X-PRADO-ACTIONS',ERROR_HEADER:'X-PRADO-ERROR',PAGESTATE_HEADER:'X-PRADO-PAGESTATE',currentRequest:null,requestQueque:[],addPostLoaders:function(ids)
+return Prado.CallbackRequest.decode(json);}}});Prado.CallbackRequest=Class.create();Object.extend(Prado.CallbackRequest,{FIELD_CALLBACK_TARGET:'PRADO_CALLBACK_TARGET',FIELD_CALLBACK_PARAMETER:'PRADO_CALLBACK_PARAMETER',FIELD_CALLBACK_PAGESTATE:'PRADO_PAGESTATE',FIELD_POSTBACK_TARGET:'PRADO_POSTBACK_TARGET',FIELD_POSTBACK_PARAMETER:'PRADO_POSTBACK_PARAMETER',PostDataLoaders:[],DATA_HEADER:'X-PRADO-DATA',ACTION_HEADER:'X-PRADO-ACTIONS',ERROR_HEADER:'X-PRADO-ERROR',PAGESTATE_HEADER:'X-PRADO-PAGESTATE',currentRequest:null,requestQueue:[],addPostLoaders:function(ids)
{var self=Prado.CallbackRequest;self.PostDataLoaders=self.PostDataLoaders.concat(ids);var list=[];self.PostDataLoaders.each(function(id)
{if(list.indexOf(id)<0)
list.push(id);});self.PostDataLoaders=list;},dispatchActions:function(transport,actions)
@@ -71,9 +71,9 @@ return null;},dispatchPriorityRequest:function(callback)
{new Ajax.Request(callback.url,callback.options);return true;},abortCurrentRequest:function()
{var self=Prado.CallbackRequest;var inProgress=self.currentRequest;if(inProgress)
{clearTimeout(inProgress.timeout);self.currentRequest=null;if(inProgress.request.transport.readyState<4)
-inProgress.request.transport.abort();return self.dispatchQueque();}
+inProgress.request.transport.abort();return self.dispatchQueue();}
else
-return self.dispatchQueque();},updatePageState:function(request,transport)
+return self.dispatchQueue();},updatePageState:function(request,transport)
{var self=Prado.CallbackRequest;var pagestate=$(self.FIELD_CALLBACK_PAGESTATE);var enabled=request.options.EnablePageStateUpdate&&request.options.HasPriority;var aborted=self.currentRequest==null;if(enabled&&!aborted&&pagestate)
{var data=request.header(self.PAGESTATE_HEADER);if(typeof(data)=="string"&&data.length>0)
pagestate.value=data;else
@@ -82,15 +82,15 @@ Logger.warn("Missing page state:"+data);return false;}}
return true;},enqueque:function(callback)
{var self=Prado.CallbackRequest;if(self.currentRequest==null)
self.dispatchPriorityRequest(callback);else
-self.requestQueque.push(callback);},dispatchQueque:function()
-{var self=Prado.CallbackRequest;if(self.requestQueque.length>0)
-{var callback=self.requestQueque.shift();return self.dispatchPriorityRequest(callback);}
+self.requestQueue.push(callback);},dispatchQueue:function()
+{var self=Prado.CallbackRequest;if(self.requestQueue.length>0)
+{var callback=self.requestQueue.shift();return self.dispatchPriorityRequest(callback);}
return false;},abortRequest:function(id)
{var self=Prado.CallbackRequest;if(self.currentRequest!=null&&self.currentRequest.id==id)
self.abortCurrentRequest();else
-{var queque=[];self.requestQueque.each(function(callback)
+{var queque=[];self.requestQueue.each(function(callback)
{if(callback.id!=id)
-queque.push(callback);});self.requestQueque=queque;}}})
+queque.push(callback);});self.requestQueue=queque;}}})
Ajax.Responders.register({onComplete:function(request)
{if(request.options.HasPriority)
Prado.CallbackRequest.abortCurrentRequest();}});Event.OnLoad(function()
@@ -112,7 +112,7 @@ return false;}
if(this.options.onPreDispatch)
this.options.onPreDispatch(this,null);if(!this.Enabled)
return;if(this.options.HasPriority)
-{return Prado.CallbackRequest.enqueque(this);}
+{return Prado.CallbackRequest.enqueue(this);}
else
return Prado.CallbackRequest.dispatchNormalRequest(this);},abort:function()
{return Prado.CallbackRequest.abortRequest(this.id);},_getPostData:function()
diff --git a/framework/Web/Javascripts/js/debug/ajax.js b/framework/Web/Javascripts/js/debug/ajax.js
index 481e827d..d051b1f0 100644
--- a/framework/Web/Javascripts/js/debug/ajax.js
+++ b/framework/Web/Javascripts/js/debug/ajax.js
@@ -412,7 +412,7 @@ Object.extend(Prado.CallbackRequest,
*/
currentRequest : null,
- requestQueque : [],
+ requestQueue : [],
/**
* Add ids of inputs element to post in the request.
@@ -597,10 +597,10 @@ Object.extend(Prado.CallbackRequest,
//abort if not ready.
if(inProgress.request.transport.readyState < 4)
inProgress.request.transport.abort();
- return self.dispatchQueque();
+ return self.dispatchQueue();
}
else
- return self.dispatchQueque();
+ return self.dispatchQueue();
},
/**
@@ -634,17 +634,17 @@ Object.extend(Prado.CallbackRequest,
if(self.currentRequest==null)
self.dispatchPriorityRequest(callback);
else
- self.requestQueque.push(callback);
- //Logger.info("current queque length="+self.requestQueque.length);
+ self.requestQueue.push(callback);
+ //Logger.info("current queque length="+self.requestQueue.length);
},
- dispatchQueque : function()
+ dispatchQueue : function()
{
var self = Prado.CallbackRequest;
- //Logger.info("dispatching queque, length="+self.requestQueque.length+" request="+self.currentRequest);
- if(self.requestQueque.length > 0)
+ //Logger.info("dispatching queque, length="+self.requestQueue.length+" request="+self.currentRequest);
+ if(self.requestQueue.length > 0)
{
- var callback = self.requestQueque.shift();
+ var callback = self.requestQueue.shift();
//Logger.info("do dispatch request");
return self.dispatchPriorityRequest(callback);
}
@@ -660,12 +660,12 @@ Object.extend(Prado.CallbackRequest,
else
{
var queque = [];
- self.requestQueque.each(function(callback)
+ self.requestQueue.each(function(callback)
{
if(callback.id != id)
queque.push(callback);
});
- self.requestQueque = queque;
+ self.requestQueue = queque;
}
}
})
@@ -835,7 +835,7 @@ Prado.CallbackRequest.prototype =
if(this.options.HasPriority)
{
- return Prado.CallbackRequest.enqueque(this);
+ return Prado.CallbackRequest.enqueue(this);
//return Prado.CallbackRequest.dispatchPriorityRequest(this);
}
else
diff --git a/framework/Web/Javascripts/prado/ajax3.js b/framework/Web/Javascripts/prado/ajax3.js
index d4221003..66b9a36a 100644
--- a/framework/Web/Javascripts/prado/ajax3.js
+++ b/framework/Web/Javascripts/prado/ajax3.js
@@ -124,7 +124,7 @@ Object.extend(Prado.CallbackRequest,
*/
currentRequest : null,
- requestQueque : [],
+ requestQueue : [],
/**
* Add ids of inputs element to post in the request.
@@ -309,10 +309,10 @@ Object.extend(Prado.CallbackRequest,
//abort if not ready.
if(inProgress.request.transport.readyState < 4)
inProgress.request.transport.abort();
- return self.dispatchQueque();
+ return self.dispatchQueue();
}
else
- return self.dispatchQueque();
+ return self.dispatchQueue();
},
/**
@@ -346,17 +346,17 @@ Object.extend(Prado.CallbackRequest,
if(self.currentRequest==null)
self.dispatchPriorityRequest(callback);
else
- self.requestQueque.push(callback);
- //Logger.info("current queque length="+self.requestQueque.length);
+ self.requestQueue.push(callback);
+ //Logger.info("current queque length="+self.requestQueue.length);
},
- dispatchQueque : function()
+ dispatchQueue : function()
{
var self = Prado.CallbackRequest;
- //Logger.info("dispatching queque, length="+self.requestQueque.length+" request="+self.currentRequest);
- if(self.requestQueque.length > 0)
+ //Logger.info("dispatching queque, length="+self.requestQueue.length+" request="+self.currentRequest);
+ if(self.requestQueue.length > 0)
{
- var callback = self.requestQueque.shift();
+ var callback = self.requestQueue.shift();
//Logger.info("do dispatch request");
return self.dispatchPriorityRequest(callback);
}
@@ -372,12 +372,12 @@ Object.extend(Prado.CallbackRequest,
else
{
var queque = [];
- self.requestQueque.each(function(callback)
+ self.requestQueue.each(function(callback)
{
if(callback.id != id)
queque.push(callback);
});
- self.requestQueque = queque;
+ self.requestQueue = queque;
}
}
})
@@ -547,7 +547,7 @@ Prado.CallbackRequest.prototype =
if(this.options.HasPriority)
{
- return Prado.CallbackRequest.enqueque(this);
+ return Prado.CallbackRequest.enqueue(this);
//return Prado.CallbackRequest.dispatchPriorityRequest(this);
}
else
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-01 12:41:18 +0000