fix error messages on invalid response to stores

[roojs1] / Roo / data / HttpProxy.js

diff --git a/Roo/data/HttpProxy.js b/Roo/data/HttpProxy.js
index 36b2d1b..9d6f402 100644 (file)
--- a/Roo/data/HttpProxy.js
+++ b/Roo/data/HttpProxy.js
@@ -103,9 +103,6 @@ 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){
@@ -133,7 +130,13 @@ Roo.extend(Roo.data.HttpProxy, Roo.data.DataProxy, {
             result = o.reader.read(response);
         }catch(e){
             this.fireEvent("loadexception", this, o, response, e);
-            o.request.callback.call(o.request.scope, null, o.request.arg, false);
+            o.request.callback.call(o.request.scope, {
+                    success : false,
+                    raw : {
+                        errorMsg : response.responseText
+                    }
+                    
+                }, o.request.arg, false);
             return;
         }