jquery ajax: addition for #2452. Wasn't working correctly in some cases.
[jquery.git] / src / ajax.js
index adae6ae..47e6635 100644 (file)
@@ -41,21 +41,20 @@ jQuery.fn.extend({
                        }
                }
 
-               var self = this;
-
                // Request the remote document
                jQuery.ajax({
                        url: url,
                        type: type,
                        dataType: "html",
                        data: params,
+                       context:this,
                        complete: function(res, status){
                                // If successful, inject the HTML into all the matched elements
                                if ( status === "success" || status === "notmodified" ) {
                                        // See if a selector was specified
-                                       self.html( selector ?
+                                       this.html( selector ?
                                                // Create a dummy div to hold the results
-                                               jQuery("<div/>")
+                                               jQuery("<div />")
                                                        // inject the contents of the document in, removing the scripts
                                                        // to avoid any 'Permission Denied' errors in IE
                                                        .append(res.responseText.replace(rscript, ""))
@@ -68,7 +67,7 @@ jQuery.fn.extend({
                                }
 
                                if ( callback ) {
-                                       self.each( callback, [res.responseText, status, res] );
+                                       this.each( callback, [res.responseText, status, res] );
                                }
                        }
                });
@@ -112,8 +111,9 @@ jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".sp
 jQuery.extend({
 
        get: function( url, data, callback, type ) {
-               // shift arguments if data argument was ommited
+               // shift arguments if data argument was omited
                if ( jQuery.isFunction( data ) ) {
+                       type = type || callback;
                        callback = data;
                        data = null;
                }
@@ -136,7 +136,9 @@ jQuery.extend({
        },
 
        post: function( url, data, callback, type ) {
+               // shift arguments if data argument was omited
                if ( jQuery.isFunction( data ) ) {
+                       type = type || callback;
                        callback = data;
                        data = {};
                }
@@ -193,8 +195,9 @@ jQuery.extend({
                // Extend the settings, but re-extend 's' so that it can be
                // checked again later (in the test suite, specifically)
                s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s));
-
+               
                var jsonp, status, data,
+                       callbackContext = s.context || window,
                        type = s.type.toUpperCase();
 
                // convert data if not already a string
@@ -275,7 +278,7 @@ jQuery.extend({
                if ( s.dataType === "script" && type === "GET" && parts
                        && ( parts[1] && parts[1] !== location.protocol || parts[2] !== location.host )) {
 
-                       var head = document.getElementsByTagName("head")[0];
+                       var head = document.getElementsByTagName("head")[0] || document.documentElement;
                        var script = document.createElement("script");
                        script.src = s.url;
                        if ( s.scriptCharset ) {
@@ -352,7 +355,7 @@ jQuery.extend({
                } catch(e){}
 
                // Allow custom headers/mimetypes and early abort
-               if ( s.beforeSend && s.beforeSend(xhr, s) === false ) {
+               if ( s.beforeSend && s.beforeSend.call(callbackContext, xhr, s) === false ) {
                        // Handle the global AJAX counter
                        if ( s.global && ! --jQuery.active ) {
                                jQuery.event.trigger( "ajaxStop" );
@@ -364,13 +367,13 @@ jQuery.extend({
                }
 
                if ( s.global ) {
-                       jQuery.event.trigger("ajaxSend", [xhr, s]);
+                       trigger("ajaxSend", [xhr, s]);
                }
 
                // Wait for a response to come back
                var onreadystatechange = function(isTimeout){
                        // The request was aborted, clear the interval and decrement jQuery.active
-                       if ( xhr.readyState === 0 ) {
+                       if ( !xhr || xhr.readyState === 0 ) {
                                if ( ival ) {
                                        // clear poll interval
                                        clearInterval( ival );
@@ -451,7 +454,7 @@ jQuery.extend({
 
                // Send the data
                try {
-                       xhr.send( type === "POST" ? s.data : null );
+                       xhr.send( type === "POST" || type === "PUT" ? s.data : null );
                } catch(e) {
                        jQuery.handleError(s, xhr, null, e);
                }
@@ -464,24 +467,24 @@ jQuery.extend({
                function success(){
                        // If a local callback was specified, fire it and pass it the data
                        if ( s.success ) {
-                               s.success( data, status );
+                               s.success.call( callbackContext, data, status );
                        }
 
                        // Fire the global callback
                        if ( s.global ) {
-                               jQuery.event.trigger( "ajaxSuccess", [xhr, s] );
+                               trigger( "ajaxSuccess", [xhr, s] );
                        }
                }
 
                function complete(){
                        // Process result
                        if ( s.complete ) {
-                               s.complete(xhr, status);
+                               s.complete.call( callbackContext, xhr, status);
                        }
 
                        // The request was completed
                        if ( s.global ) {
-                               jQuery.event.trigger( "ajaxComplete", [xhr, s] );
+                               trigger( "ajaxComplete", [xhr, s] );
                        }
 
                        // Handle the global AJAX counter
@@ -489,6 +492,10 @@ jQuery.extend({
                                jQuery.event.trigger( "ajaxStop" );
                        }
                }
+               
+               function trigger(type, args){
+                       (s.context ? jQuery(s.context) : jQuery.event).trigger(type, args);
+               }
 
                // return XMLHttpRequest to allow aborting the request etc.
                return xhr;
@@ -497,12 +504,12 @@ jQuery.extend({
        handleError: function( s, xhr, status, e ) {
                // If a local callback was specified, fire it
                if ( s.error ) {
-                       s.error( xhr, status, e );
+                       s.error.call( s.context || window, xhr, status, e );
                }
 
                // Fire the global callback
                if ( s.global ) {
-                       jQuery.event.trigger( "ajaxError", [xhr, s, e] );
+                       (s.context ? jQuery(s.context) : jQuery.event).trigger( "ajaxError", [xhr, s, e] );
                }
        },
 
@@ -524,11 +531,11 @@ jQuery.extend({
 
        // Determines if an XMLHttpRequest returns NotModified
        httpNotModified: function( xhr, url ) {
-               var last_modified = xhr.getResponseHeader("Last-Modified"),
+               var lastModified = xhr.getResponseHeader("Last-Modified"),
                        etag = xhr.getResponseHeader("Etag");
 
-               if ( last_modified ) {
-                       jQuery.lastModified[url] = last_modified;
+               if ( lastModified ) {
+                       jQuery.lastModified[url] = lastModified;
                }
 
                if ( etag ) {
@@ -588,23 +595,28 @@ jQuery.extend({
                // of form elements
                if ( jQuery.isArray(a) || a.jquery ) {
                        // Serialize the form elements
-                       jQuery.each( a, function(){
+                       jQuery.each( a, function() {
                                add( this.name, this.value );
                        });
-
-               // Otherwise, assume that it's an object of key/value pairs
                } else {
-                       // Serialize the key/values
-                       for ( var j in a ) {
-                               // If the value is an array then the key names need to be repeated
-                               if ( jQuery.isArray(a[j]) ) {
-                                       jQuery.each( a[j], function(){
-                                               add( j, this );
-                                       });
+                       // Recursively encode parameters from object, 
+                       // building a prefix path as we go down
+                       function buildParams(obj, prefix)
+                       {
+                               if ( jQuery.isArray(obj) ) {
+                                       for ( var i = 0, length = obj.length; i < length; i++ ) {
+                                               buildParams( obj[i], prefix );
+                                       };
+                               } else if( typeof(obj) == "object" ) {
+                                       for ( var j in obj ) {
+                                               var postfix = ((j.indexOf("[]") > 0) ? "[]" : ""); // move any brackets to the end
+                                               buildParams(obj[j], (prefix ? (prefix+"["+j.replace("[]", "")+"]"+postfix) : j) );
+                                       }
                                } else {
-                                       add( j, jQuery.isFunction(a[j]) ? a[j]() : a[j] );
+                                       add( prefix, jQuery.isFunction(obj) ? obj() : obj );
                                }
                        }
+                       buildParams(a);
                }
 
                // Return the resulting serialization