Fix for #914.

[jquery.git] / src / ajax / ajax.js

diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js
index 6651903..b513e63 100644 (file)
--- a/src/ajax/ajax.js
+++ b/src/ajax/ajax.js
@@ -55,7 +55,7 @@ jQuery.fn.extend({
                // If the second parameter was provided
                if ( params )
                        // If it's a function
-                       if ( jQuery.isFunction( params.constructor ) ) {
+                       if ( jQuery.isFunction( params ) ) {
                                // We assume that it's the callback
                                callback = params;
                                params = null;
@@ -132,7 +132,7 @@ jQuery.fn.extend({
 });
 
 // If IE is used, create a wrapper for the XMLHttpRequest object
-if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" )
+if ( !window.XMLHttpRequest )
        XMLHttpRequest = function(){
                return new ActiveXObject("Microsoft.XMLHTTP");
        };
@@ -223,7 +223,7 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" )
  */
  
 /**
- * Attach a function to be executed before an AJAX request is send.
+ * Attach a function to be executed before an AJAX request is sent.
  *
  * The XMLHttpRequest and settings used for that request are passed
  * as arguments to the callback.
@@ -231,7 +231,7 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" )
  * @example $("#msg").ajaxSend(function(request, settings){
  *   $(this).append("<li>Starting request at " + settings.url + "</li>");
  * });
- * @desc Show a message before an AJAX request is send.
+ * @desc Show a message before an AJAX request is sent.
  *
  * @name ajaxSend
  * @type jQuery
@@ -391,6 +391,11 @@ jQuery.extend({
         * @cat Ajax
         */
        post: function( url, data, callback, type ) {
+               if ( jQuery.isFunction( data ) ) {
+                       callback = data;
+                       data = {};
+               }
+
                return jQuery.ajax({
                        type: "POST",
                        url: url,
@@ -457,7 +462,8 @@ jQuery.extend({
                timeout: 0,
                contentType: "application/x-www-form-urlencoded",
                processData: true,
-               async: true
+               async: true,
+               data: null
        },
        
        // Last-Modified header cache for next request
@@ -536,7 +542,7 @@ jQuery.extend({
         * the default content-type "application/x-www-form-urlencoded". If you want to send
         * DOMDocuments, set this option to false.
         *
-        * (Boolean) async - By default, all requests are send asynchronous (set to true).
+        * (Boolean) async - By default, all requests are sent asynchronous (set to true).
         * If you need synchronous requests, set this option to false.
         *
         * (Function) beforeSend - A pre-callback to set custom headers etc., the
@@ -593,9 +599,12 @@ jQuery.extend({
                        if (s.processData && typeof s.data != "string")
                        s.data = jQuery.param(s.data);
                        // append data to url for get requests
-                       if( s.type.toLowerCase() == "get" )
+                       if( s.type.toLowerCase() == "get" ) {
                                // "?" + data or "&" + data (in case there are already params)
                                s.url += ((s.url.indexOf("?") > -1) ? "&" : "?") + s.data;
+                               // IE likes to send both get and post data, prevent this
+                               s.data = null;
+                       }
                }
 
                // Watch for a new set of requests
@@ -789,17 +798,19 @@ jQuery.extend({
                // of form elements
                if ( a.constructor == Array || a.jquery )
                        // Serialize the form elements
-                       for ( var i = 0; i < a.length; i++ )
-                               s.push( encodeURIComponent(a[i].name) + "=" + encodeURIComponent( a[i].value ) );
+                       jQuery.each( a, function(){
+                               s.push( encodeURIComponent(this.name) + "=" + encodeURIComponent( 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 ( a[j].constructor == Array )
-                                       for ( var k = 0; k < a[j].length; k++ )
-                                               s.push( encodeURIComponent(j) + "=" + encodeURIComponent( a[j][k] ) );
+                               if ( a[j] && a[j].constructor == Array )
+                                       jQuery.each( a[j], function(){
+                                               s.push( encodeURIComponent(j) + "=" + encodeURIComponent( this ) );
+                                       });
                                else
                                        s.push( encodeURIComponent(j) + "=" + encodeURIComponent( a[j] ) );