Roo/data/HttpProxy.js

diff --git a/Roo/data/HttpProxy.js b/Roo/data/HttpProxy.js
index 0b979ee..36b2d1b 100644 (file)
--- a/Roo/data/HttpProxy.js
+++ b/Roo/data/HttpProxy.js
@@ -103,6 +103,9 @@ Roo.extend(Roo.data.HttpProxy, Roo.data.DataProxy, {
                 callback : this.loadResponse,
                 scope: this
             };
+            if (this.timeout) {
+                o.timeout = this.timeout;
+            }
             if(this.useAjax){
                 Roo.applyIf(o, this.conn);
                 if(this.activeRequest){