Changeset 12630

Timestamp:

02/22/08 16:56:27 (11 months ago)

Author:

pottedmeat

Message:

Refs #5602. Update pseudo-classes !strict

Files:

• dojo/trunk/_base/xhr.js (modified) (13 diffs)

dojo/trunk/_base/xhr.js

@@ -255 +255 @@
 
         /*=====
-        dojo.__ioArgs = function(kwArgs){
+        dojo.__IoArgs = function(       url, content, timeout, form,
+                                                                preventCache, handleAs, load, error, handle){
                 //      url: String
                 //              URL to server endpoint.
@@ -278 +279 @@
                 //      load: Function?
                 //              function(response, ioArgs){}. response is an Object, ioArgs
-                //              is of type dojo.__ioCallbackArgs. The load function will be
+                //              is of type dojo.__IoCallbackArgs. The load function will be
                 //              called on a successful response.
                 //      error: Function?
                 //              function(response, ioArgs){}. response is an Object, ioArgs
-                //              is of type dojo.__ioCallbackArgs. The error function will
+                //              is of type dojo.__IoCallbackArgs. The error function will
                 //              be called in an error case. 
-                //      handle: Function
+                //      handle: Function?
                 //              function(response, ioArgs){}. response is an Object, ioArgs
-                //              is of type dojo.__ioCallbackArgs. The handle function will
+                //              is of type dojo.__IoCallbackArgs. The handle function will
                 //              be called in either the successful or error case.  For
                 //              the load, error and handle functions, the ioArgs object
                 //              will contain the following properties: 
+                this.url = url;
+                this.content = content;
+                this.timeout = timeout;
+                this.form = form;
+                this.preventCache = preventCache;
+                this.handleAs = handleAs;
+                this.load = load;
+                this.error = error;
+                this.handle = handle;
         }
         =====*/
 
         /*=====
-        dojo.__ioCallbackArgs = function(kwArgs){
+        dojo.__IoCallbackArgs = function(args, xhr, url, query, handleAs, id, canDelete, json){
                 //      args: Object
                 //              the original object argument to the IO call.
@@ -328 +338 @@
                 //              the same object should be passed to the success
                 //              callbacks directly.
+                this.args = args;
+                this.xhr = xhr;
+                this.url = url;
+                this.query = query;
+                this.handleAs = handleAs;
+                this.id = id;
+                this.canDelete = canDelete;
+                this.json = json;
         }
         =====*/
@@ -333 +351 @@
 
 
-        dojo._ioSetArgs = function(/*dojo.__ioArgs*/args,
+        dojo._ioSetArgs = function(/*dojo.__IoArgs*/args,
                         /*Function*/canceller,
                         /*Function*/okHandler,
@@ -448 +466 @@
         }
 
-        var _makeXhrDeferred = function(/*dojo.__xhrArgs*/args){
+        var _makeXhrDeferred = function(/*dojo.__XhrArgs*/args){
                 //summary: makes the Deferred object for this xhr request.
                 var dfd = _d._ioSetArgs(args, _deferredCancel, _deferredOk, _deferError);
@@ -596 +614 @@
         }
 
-        dojo._ioAddQueryToUrl = function(/*dojo.__ioCallbackArgs*/ioArgs){
+        dojo._ioAddQueryToUrl = function(/*dojo.__IoCallbackArgs*/ioArgs){
                 //summary: Adds query params discovered by the io deferred construction to the URL.
                 //Only use this for operations which are fundamentally GET-type operations.
@@ -606 +624 @@
 
         /*=====
-        dojo.__xhrArgs = function(kwArgs){
-                //      summary:
-                //              In addition to the properties listed for the dojo.__ioArgs type,
-                //              the following properties are allowed for dojo.xhr* methods.
-                //      handleAs: 
-                //              String. Acceptable values are:
-                //                      "text" (default)
-                //                      "json"
-                //                      "json-comment-optional"
-                //                      "json-comment-filtered"
-                //                      "javascript"
-                //                      "xml"
-                //      sync:
-                //              Boolean. false is default. Indicates whether the request should
-                //              be a synchronous (blocking) request.
-                //      headers:
-                //              Object. Additional HTTP headers to send in the request.
-        }
+        dojo.declare("dojo.__XhrArgs", dojo.__IoArgs, {
+                constructor: function(handleAs, sync, headers){
+                        //      summary:
+                        //              In addition to the properties listed for the dojo._IoArgs type,
+                        //              the following properties are allowed for dojo.xhr* methods.
+                        //      handleAs: String?
+                        //              Acceptable values are: text (default), json, json-comment-optional,
+                        //              json-comment-filtered, javascript, xml
+                        //      sync: Boolean?
+                        //              false is default. Indicates whether the request should
+                        //              be a synchronous (blocking) request.
+                        //      headers: Object?
+                        //              Additional HTTP headers to send in the request.
+                        this.handleAs = handleAs;
+                        this.sync = sync;
+                        this.headers = headers;
+                }
+        });
         =====*/
 
-        dojo.xhr = function(/*String*/ method, /*dojo.__xhrArgs*/ args, /*boolean?*/ hasBody){
+        dojo.xhr = function(/*String*/ method, /*dojo.__XhrArgs*/ args, /*boolean?*/ hasBody){
                 //      summary: 
                 //              Sends an HTTP request with the given method. If the request has an 
@@ -640 +658 @@
         }
 
-        dojo.xhrGet = function(/*dojo.__xhrArgs*/ args){
+        dojo.xhrGet = function(/*dojo.__XhrArgs*/ args){
                 //      summary: 
                 //              Sends an HTTP GET request to the server.
@@ -646 +664 @@
         }
 
-        dojo.xhrPost = function(/*dojo.__xhrArgs*/ args){
+        dojo.xhrPost = function(/*dojo.__XhrArgs*/ args){
                 //summary: 
                 //              Sends an HTTP POST request to the server.
@@ -652 +670 @@
         }
 
-        dojo.rawXhrPost = function(/*dojo.__xhrArgs*/ args){
+        dojo.rawXhrPost = function(/*dojo.__XhrArgs*/ args){
                 //      summary:
                 //              Sends an HTTP POST request to the server. In addtion to the properties
-                //              listed for the dojo.__xhrArgs type, the following property is allowed:
+                //              listed for the dojo.__XhrArgs type, the following property is allowed:
                 //      postData:
                 //              String. The raw data to send in the body of the POST request.
@@ -663 +681 @@
         }
 
-        dojo.xhrPut = function(/*dojo.__xhrArgs*/ args){
+        dojo.xhrPut = function(/*dojo.__XhrArgs*/ args){
                 //      summary:
                 //              Sends an HTTP PUT request to the server.
@@ -669 +687 @@
         }
 
-        dojo.rawXhrPut = function(/*dojo.__xhrArgs*/ args){
+        dojo.rawXhrPut = function(/*dojo.__XhrArgs*/ args){
                 //      summary:
                 //              Sends an HTTP PUT request to the server. In addtion to the properties
-                //              listed for the dojo.__xhrArgs type, the following property is allowed:
+                //              listed for the dojo.__XhrArgs type, the following property is allowed:
                 //      putData:
                 //              String. The raw data to send in the body of the PUT request.
@@ -684 +702 @@
         }
 
-        dojo.xhrDelete = function(/*dojo.__xhrArgs*/ args){
+        dojo.xhrDelete = function(/*dojo.__XhrArgs*/ args){
                 //      summary:
                 //              Sends an HTTP DELETE request to the server.