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.3.1 - Released 11/30/2010
[extjs.git]
/
src
/
ext-core
/
src
/
data
/
Connection.js
diff --git
a/src/ext-core/src/data/Connection.js
b/src/ext-core/src/data/Connection.js
index
270aad7
..
14cee01
100644
(file)
--- a/
src/ext-core/src/data/Connection.js
+++ b/
src/ext-core/src/data/Connection.js
@@
-1,8
+1,8
@@
/*!
/*!
- * Ext JS Library 3.
2.2
- * Copyright(c) 2006-2010
Ext JS,
Inc.
- * licensing@
extjs
.com
- * http://www.
extjs
.com/license
+ * Ext JS Library 3.
3.1
+ * Copyright(c) 2006-2010
Sencha
Inc.
+ * licensing@
sencha
.com
+ * http://www.
sencha
.com/license
*/
(function(){
var BEFOREREQUEST = "beforerequest",
*/
(function(){
var BEFOREREQUEST = "beforerequest",
@@
-244,7
+244,7
@@
Ext.Ajax.request({
failure: me.handleFailure,
scope: me,
argument: {options: o},
failure: me.handleFailure,
scope: me,
argument: {options: o},
- timeout :
o.timeout || me.timeout
+ timeout :
Ext.num(o.timeout, me.timeout)
},
form,
serForm;
},
form,
serForm;
@@
-262,7
+262,7
@@
Ext.Ajax.request({
if((form = Ext.getDom(o.form))){
url = url || form.action;
if((form = Ext.getDom(o.form))){
url = url || form.action;
- if(o.isUpload ||
/multipart\/form-data/i.test(form.getAttribute("enctype"
))) {
+ if(o.isUpload ||
(/multipart\/form-data/i.test(form.getAttribute("enctype")
))) {
return me.doFormUpload.call(me, o, p, url);
}
serForm = Ext.lib.Ajax.serializeForm(form);
return me.doFormUpload.call(me, o, p, url);
}
serForm = Ext.lib.Ajax.serializeForm(form);