git.ithinksw.org
/
extjs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to ExtJS 3.0.3 - Released 10/11/2009
[extjs.git]
/
src
/
direct
/
RemotingProvider.js
diff --git
a/src/direct/RemotingProvider.js
b/src/direct/RemotingProvider.js
index
3b0f2a4
..
3f6b7fc
100644
(file)
--- a/
src/direct/RemotingProvider.js
+++ b/
src/direct/RemotingProvider.js
@@
-1,5
+1,5
@@
/*!
/*!
- * Ext JS Library 3.0.
0
+ * Ext JS Library 3.0.
3
* Copyright(c) 2006-2009 Ext JS, LLC
* licensing@extjs.com
* http://www.extjs.com/license
* Copyright(c) 2006-2009 Ext JS, LLC
* licensing@extjs.com
* http://www.extjs.com/license
@@
-102,9
+102,15
@@
TestAction.multiply(
\r
/**
\r
* @cfg {Number} maxRetries
\r
\r
/**
\r
* @cfg {Number} maxRetries
\r
- * Number of times to re-attempt delivery on failure of a call.
\r
+ * Number of times to re-attempt delivery on failure of a call.
Defaults to <tt>1</tt>.
\r
*/
\r
maxRetries: 1,
\r
*/
\r
maxRetries: 1,
\r
+
\r
+ /**
\r
+ * @cfg {Number} timeout
\r
+ * The timeout to use for each request. Defaults to <tt>undefined</tt>.
\r
+ */
\r
+ timeout: undefined,
\r
\r
constructor : function(config){
\r
Ext.direct.RemotingProvider.superclass.constructor.call(this, config);
\r
\r
constructor : function(config){
\r
Ext.direct.RemotingProvider.superclass.constructor.call(this, config);
\r
@@
-117,7
+123,7
@@
TestAction.multiply(
* @param {Ext.direct.RemotingProvider} provider
\r
* @param {Ext.Direct.Transaction} transaction
\r
*/
\r
* @param {Ext.direct.RemotingProvider} provider
\r
* @param {Ext.Direct.Transaction} transaction
\r
*/
\r
- 'beforecall',
\r
+ 'beforecall',
\r
/**
\r
* @event call
\r
* Fires immediately after the request to the server-side is sent. This does
\r
/**
\r
* @event call
\r
* Fires immediately after the request to the server-side is sent. This does
\r
@@
-127,7
+133,7
@@
TestAction.multiply(
*/
\r
'call'
\r
);
\r
*/
\r
'call'
\r
);
\r
- this.namespace = (
typeof this.namespace === 'string'
) ? Ext.ns(this.namespace) : this.namespace || window;
\r
+ this.namespace = (
Ext.isString(this.namespace)
) ? Ext.ns(this.namespace) : this.namespace || window;
\r
this.transactions = {};
\r
this.callBuffer = [];
\r
},
\r
this.transactions = {};
\r
this.callBuffer = [];
\r
},
\r
@@
-136,8
+142,8
@@
TestAction.multiply(
initAPI : function(){
\r
var o = this.actions;
\r
for(var c in o){
\r
initAPI : function(){
\r
var o = this.actions;
\r
for(var c in o){
\r
- var cls = this.namespace[c] || (this.namespace[c] = {})
;
\r
-
var
ms = o[c];
\r
+ var cls = this.namespace[c] || (this.namespace[c] = {})
,
\r
+
ms = o[c];
\r
for(var i = 0, len = ms.length; i < len; i++){
\r
var m = ms[i];
\r
cls[m.name] = this.createMethod(c, m);
\r
for(var i = 0, len = ms.length; i < len; i++){
\r
var m = ms[i];
\r
cls[m.name] = this.createMethod(c, m);
\r
@@
-171,8
+177,8
@@
TestAction.multiply(
if(success){
\r
var events = this.getEvents(xhr);
\r
for(var i = 0, len = events.length; i < len; i++){
\r
if(success){
\r
var events = this.getEvents(xhr);
\r
for(var i = 0, len = events.length; i < len; i++){
\r
- var e = events[i]
;
\r
-
var
t = this.getTransaction(e);
\r
+ var e = events[i]
,
\r
+
t = this.getTransaction(e);
\r
this.fireEvent('data', this, e);
\r
if(t){
\r
this.doCallback(t, e, true);
\r
this.fireEvent('data', this, e);
\r
if(t){
\r
this.doCallback(t, e, true);
\r
@@
-218,11
+224,10
@@
TestAction.multiply(
url: this.url,
\r
callback: this.onData,
\r
scope: this,
\r
url: this.url,
\r
callback: this.onData,
\r
scope: this,
\r
- ts: data
\r
- };
\r
+ ts: data,
\r
+ timeout: this.timeout
\r
+ }, callData;
\r
\r
\r
- // send only needed data
\r
- var callData;
\r
if(Ext.isArray(data)){
\r
callData = [];
\r
for(var i = 0, len = data.length; i < len; i++){
\r
if(Ext.isArray(data)){
\r
callData = [];
\r
for(var i = 0, len = data.length; i < len; i++){
\r
@@
-234,7
+239,7
@@
TestAction.multiply(
\r
if(this.enableUrlEncode){
\r
var params = {};
\r
\r
if(this.enableUrlEncode){
\r
var params = {};
\r
- params[
typeof this.enableUrlEncode == 'string'
? this.enableUrlEncode : 'data'] = Ext.encode(callData);
\r
+ params[
Ext.isString(this.enableUrlEncode)
? this.enableUrlEncode : 'data'] = Ext.encode(callData);
\r
o.params = params;
\r
}else{
\r
o.jsonData = callData;
\r
o.params = params;
\r
}else{
\r
o.jsonData = callData;
\r
@@
-260,7
+265,7
@@
TestAction.multiply(
if(!this.callTask){
\r
this.callTask = new Ext.util.DelayedTask(this.combineAndSend, this);
\r
}
\r
if(!this.callTask){
\r
this.callTask = new Ext.util.DelayedTask(this.combineAndSend, this);
\r
}
\r
- this.callTask.delay(
typeof this.enableBuffer == 'number'
? this.enableBuffer : 10);
\r
+ this.callTask.delay(
Ext.isNumber(this.enableBuffer)
? this.enableBuffer : 10);
\r
}else{
\r
this.combineAndSend();
\r
}
\r
}else{
\r
this.combineAndSend();
\r
}
\r
@@
-359,8
+364,8
@@
TestAction.multiply(
doCallback: function(t, e){
\r
var fn = e.status ? 'success' : 'failure';
\r
if(t && t.cb){
\r
doCallback: function(t, e){
\r
var fn = e.status ? 'success' : 'failure';
\r
if(t && t.cb){
\r
- var hs = t.cb
;
\r
-
var result = e.result ||
e.data;
\r
+ var hs = t.cb
,
\r
+
result = Ext.isDefined(e.result) ? e.result :
e.data;
\r
if(Ext.isFunction(hs)){
\r
hs(result, e);
\r
} else{
\r
if(Ext.isFunction(hs)){
\r
hs(result, e);
\r
} else{
\r