projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5b89914
)
Roo/data/Connection.js
author
Alan Knowles
<alan@roojs.com>
Mon, 3 Dec 2012 10:32:13 +0000
(18:32 +0800)
committer
Alan Knowles
<alan@roojs.com>
Mon, 3 Dec 2012 10:32:13 +0000
(18:32 +0800)
Roo/data/Connection.js
patch
|
blob
|
history
diff --git
a/Roo/data/Connection.js
b/Roo/data/Connection.js
index
3b04c42
..
81fc6a8
100644
(file)
--- a/
Roo/data/Connection.js
+++ b/
Roo/data/Connection.js
@@
-176,7
+176,7
@@
Roo.extend(Roo.data.Connection, Roo.util.Observable, {
failure: this.handleFailure,
scope: this,
argument: {options: o},
- timeout : this.timeout
+ timeout :
o.timeout ||
this.timeout
};
var method = o.method||this.method||(p ? "POST" : "GET");