Upgrade to ExtJS 3.0.3 - Released 10/11/2009

[extjs.git] / src / data / DirectProxy.js

diff --git a/src/data/DirectProxy.js b/src/data/DirectProxy.js
index 1447587..acf84bd 100644 (file)
--- a/src/data/DirectProxy.js
+++ b/src/data/DirectProxy.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
@@ -52,31 +52,35 @@ paramOrder: 'param1|param2|param'
 \r
         switch (action) {\r
             case Ext.data.Api.actions.create:\r
-                args.push(params[reader.meta.root]);           // <-- create(Hash)\r
+                args.push(params.jsonData[reader.meta.root]);          // <-- create(Hash)\r
                 break;\r
             case Ext.data.Api.actions.read:\r
-                if(this.paramOrder){\r
-                    for(var i = 0, len = this.paramOrder.length; i < len; i++){\r
-                        args.push(params[this.paramOrder[i]]);\r
+                // If the method has no parameters, ignore the paramOrder/paramsAsHash.\r
+                if(directFn.directCfg.method.len > 0){\r
+                    if(this.paramOrder){\r
+                        for(var i = 0, len = this.paramOrder.length; i < len; i++){\r
+                            args.push(params[this.paramOrder[i]]);\r
+                        }\r
+                    }else if(this.paramsAsHash){\r
+                        args.push(params);\r
                     }\r
-                }else if(this.paramsAsHash){\r
-                    args.push(params);\r
                 }\r
                 break;\r
             case Ext.data.Api.actions.update:\r
-                args.push(params[reader.meta.idProperty]);  // <-- save(Integer/Integer[], Hash/Hash[])\r
-                args.push(params[reader.meta.root]);\r
+                args.push(params.jsonData[reader.meta.root]);        // <-- update(Hash/Hash[])\r
                 break;\r
             case Ext.data.Api.actions.destroy:\r
-                args.push(params[reader.meta.root]);        // <-- destroy(Int/Int[])\r
+                args.push(params.jsonData[reader.meta.root]);        // <-- destroy(Int/Int[])\r
                 break;\r
         }\r
 \r
         var trans = {\r
             params : params || {},\r
-            callback : callback,\r
-            scope : scope,\r
-            arg : options,\r
+            request: {\r
+                callback : callback,\r
+                scope : scope,\r
+                arg : options\r
+            },\r
             reader: reader\r
         };\r
 \r
@@ -93,7 +97,7 @@ paramOrder: 'param1|param2|param'
                     this.fireEvent("loadexception", this, trans, res, null);\r
                 }\r
                 this.fireEvent('exception', this, 'remote', action, trans, res, null);\r
-                trans.callback.call(trans.scope, null, trans.arg, false);\r
+                trans.request.callback.call(trans.request.scope, null, trans.request.arg, false);\r
                 return;\r
             }\r
             if (action === Ext.data.Api.actions.read) {\r
@@ -120,11 +124,11 @@ paramOrder: 'param1|param2|param'
             this.fireEvent("loadexception", this, trans, res, ex);\r
 \r
             this.fireEvent('exception', this, 'response', action, trans, res, ex);\r
-            trans.callback.call(trans.scope, null, trans.arg, false);\r
+            trans.request.callback.call(trans.request.scope, null, trans.request.arg, false);\r
             return;\r
         }\r
-        this.fireEvent("load", this, res, trans.arg);\r
-        trans.callback.call(trans.scope, records, trans.arg, true);\r
+        this.fireEvent("load", this, res, trans.request.arg);\r
+        trans.request.callback.call(trans.request.scope, records, trans.request.arg, true);\r
     },\r
     /**\r
      * Callback for write actions\r
@@ -134,8 +138,9 @@ paramOrder: 'param1|param2|param'
      * @private\r
      */\r
     onWrite : function(action, trans, result, res, rs) {\r
-        this.fireEvent("write", this, action, result, res, rs, trans.arg);\r
-        trans.callback.call(trans.scope, result, res, true);\r
+        var data = trans.reader.extractData(result);\r
+        this.fireEvent("write", this, action, data, res, rs, trans.request.arg);\r
+        trans.request.callback.call(trans.request.scope, data, res, true);\r
     }\r
 });\r
 \r