Fix fix for #6481 introduced at 7862c45ad2f32096383a21b8b301155787724476 which did...
[jquery.git] / src / ajax.js
index 36b979d..3f4f732 100644 (file)
@@ -1,10 +1,24 @@
-jQuery.fn.extend({
-       // Keep a copy of the old load
-       _load: jQuery.fn.load,
+(function( jQuery ) {
+       
+var rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
+       rselectTextarea = /^(?:select|textarea)/i,
+       rinput = /^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
+       rbracket = /\[\]$/,
+       rquery = /\?/,
+       r20 = /%20/g,
+
+       // Keep a copy of the old load method
+       _load = jQuery.fn.load;
 
+jQuery.fn.extend({
        load: function( url, params, callback ) {
-               if ( typeof url != 'string' )
-                       return this._load( url );
+               if ( typeof url !== "string" && _load ) {
+                       return _load.apply( this, arguments );
+
+               // Don't do a request if no elements are being requested
+               } else if ( !this.length ) {
+                       return this;
+               }
 
                var off = url.indexOf(" ");
                if ( off >= 0 ) {
@@ -12,13 +26,11 @@ jQuery.fn.extend({
                        url = url.slice(0, off);
                }
 
-               callback = callback || function(){};
-
                // Default to a GET request
                var type = "GET";
 
                // If the second parameter was provided
-               if ( params )
+               if ( params ) {
                        // If it's a function
                        if ( jQuery.isFunction( params ) ) {
                                // We assume that it's the callback
@@ -26,59 +38,66 @@ jQuery.fn.extend({
                                params = null;
 
                        // Otherwise, build a param string
-                       } else {
-                               params = jQuery.param( params );
+                       } else if ( typeof params === "object" ) {
+                               params = jQuery.param( params, jQuery.ajaxSettings.traditional );
                                type = "POST";
                        }
-
+               }
+               
                var self = this;
-
+               
                // Request the remote document
                jQuery.ajax({
                        url: url,
                        type: type,
                        dataType: "html",
                        data: params,
-                       complete: function(res, status){
+                       complete: function( res, status ) {
                                // If successful, inject the HTML into all the matched elements
-                               if ( status == "success" || status == "notmodified" )
+                               if ( status === "success" || status === "notmodified" ) {
                                        // See if a selector was specified
                                        self.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(/<script(.|\s)*?\/script>/g, ""))
+                                                       .append(res.responseText.replace(rscript, ""))
 
                                                        // Locate the specified elements
                                                        .find(selector) :
 
                                                // If not, just inject the full result
                                                res.responseText );
+                               }
 
-                               self.each( callback, [res.responseText, status, res] );
+                               if ( callback ) {
+                                       self.each( callback, [res.responseText, status, res] );
+                               }
                        }
                });
+
                return this;
        },
 
        serialize: function() {
                return jQuery.param(this.serializeArray());
        },
+
        serializeArray: function() {
                return this.map(function(){
-                       return jQuery.nodeName(this, "form") ?
-                               jQuery.makeArray(this.elements) : this;
+                       return this.elements ? jQuery.makeArray(this.elements) : this;
                })
                .filter(function(){
                        return this.name && !this.disabled &&
-                               (this.checked || /select|textarea/i.test(this.nodeName) ||
-                                       /text|hidden|password/i.test(this.type));
+                               (this.checked || rselectTextarea.test(this.nodeName) ||
+                                       rinput.test(this.type));
                })
                .map(function(i, elem){
                        var val = jQuery(this).val();
-                       return val == null ? null :
-                               val.constructor == Array ?
+
+                       return val == null ?
+                               null :
+                               jQuery.isArray(val) ?
                                        jQuery.map( val, function(val, i){
                                                return {name: elem.name, value: val};
                                        }) :
@@ -88,18 +107,18 @@ jQuery.fn.extend({
 });
 
 // Attach a bunch of functions for handling common AJAX events
-jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","), function(i,o){
+jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), function(i,o){
        jQuery.fn[o] = function(f){
                return this.bind(o, f);
        };
 });
 
-var jsc = now();
-
 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;
                }
@@ -122,7 +141,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 = {};
                }
@@ -144,368 +165,242 @@ jQuery.extend({
                url: location.href,
                global: true,
                type: "GET",
-               timeout: 0,
                contentType: "application/x-www-form-urlencoded",
                processData: true,
                async: true,
+               /*
+               timeout: 0,
                data: null,
+               dataType: null,
+               dataTypes: null,
                username: null,
                password: null,
+               cache: null,
+               traditional: false,
+               */
+               xhr: function() {
+                       return new window.XMLHttpRequest();
+               },
+               xhrResponseFields: {
+                       xml: "XML",
+                       text: "Text",
+                       json: "JSON"
+               },
+                       
                accepts: {
                        xml: "application/xml, text/xml",
                        html: "text/html",
-                       script: "text/javascript, application/javascript",
-                       json: "application/json, text/javascript",
                        text: "text/plain",
-                       _default: "*/*"
+                       json: "application/json, text/javascript",
+                       "*": "*/*"
+               },
+               
+               autoDataType: {
+                       xml: /xml/,
+                       html: /html/,
+                       json: /json/
+               },
+               
+               // Prefilters
+               // 1) They are useful to introduce custom dataTypes (see transport/jsonp for an example)
+               // 2) These are called:
+               //    * BEFORE asking for a transport
+               //    * AFTER param serialization (s.data is a string if s.processData is true)
+               // 3) They MUST be order agnostic
+               prefilters: [],
+               
+               // Transports bindings
+               // 1) key is the dataType
+               // 2) the catchall symbol "*" can be used
+               // 3) selection will start with transport dataType and THEN go to "*" if needed
+               transports: {
+               },
+               
+               // Checkers
+               // 1) key is dataType
+               // 2) they are called to control successful response
+               // 3) error throws is used as error data
+               dataCheckers: {
+       
+                       // Check if data is a string
+                       "text": function(data) {
+                               if ( typeof data != "string" ) {
+                                       jQuery.error("typeerror");
+                               }
+                       },
+       
+                       // Check if xml has been properly parsed
+                       "xml": function(data) {
+                               var documentElement = data ? data.documentElement : data;
+                               if ( ! documentElement || ! documentElement.nodeName ) {
+                                       jQuery.error("typeerror");
+                               }
+                               if ( documentElement.nodeName == "parsererror" ) {
+                                       jQuery.error("parsererror");
+                               }
+                       }
+               },
+               
+               // List of data converters
+               // 1) key format is "source_type => destination_type" (spaces required)
+               // 2) the catchall symbol "*" can be used for source_type
+               dataConverters: {
+               
+                       // Convert anything to text
+                       "* => text": function(data) {
+                               return "" + data;
+                       },
+                       
+                       // Text to html (no transformation)
+                       "text => html": function(data) {
+                               return data;
+                       },
+                       
+                       // Evaluate text as a json expression
+                       "text => json": jQuery.parseJSON,
+                       
+                       // Parse text as xml
+                       "text => xml": function(data) {
+                               var xml, parser;
+                               if ( window.DOMParser ) { // Standard
+                                       parser = new DOMParser();
+                                       xml = parser.parseFromString(data,"text/xml");
+                               } else { // IE
+                                       xml = new ActiveXObject("Microsoft.XMLDOM");
+                                       xml.async="false";
+                                       xml.loadXML(data);
+                               }
+                               return xml;
+                       }
                }
        },
 
-       // Last-Modified header cache for next request
-       lastModified: {},
-
-       ajax: function( s ) {
-               // 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, jsre = /=\?(&|$)/g, status, data,
-                       type = s.type.toUpperCase();
-
-               // convert data if not already a string
-               if ( s.data && s.processData && typeof s.data != "string" )
-                       s.data = jQuery.param(s.data);
-
-               // Handle JSONP Parameter Callbacks
-               if ( s.dataType == "jsonp" ) {
-                       if ( type == "GET" ) {
-                               if ( !s.url.match(jsre) )
-                                       s.url += (s.url.match(/\?/) ? "&" : "?") + (s.jsonp || "callback") + "=?";
-                       } else if ( !s.data || !s.data.match(jsre) )
-                               s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
-                       s.dataType = "json";
+       // Main method
+       ajax: function( url , s ) {
+               
+               if ( arguments.length === 1 ) {
+                       s = url;
+                       url = s ? s.url : undefined;
                }
+               
+               return jQuery.xhr().open( s ? s.type : undefined , url ).send( undefined , s );
+               
+       },
 
-               // Build temporary JSONP function
-               if ( s.dataType == "json" && (s.data && s.data.match(jsre) || s.url.match(jsre)) ) {
-                       jsonp = "jsonp" + jsc++;
-
-                       // Replace the =? sequence both in the query string and the data
-                       if ( s.data )
-                               s.data = (s.data + "").replace(jsre, "=" + jsonp + "$1");
-                       s.url = s.url.replace(jsre, "=" + jsonp + "$1");
-
-                       // We need to make sure
-                       // that a JSONP style response is executed properly
-                       s.dataType = "script";
-
-                       // Handle JSONP-style loading
-                       window[ jsonp ] = function(tmp){
-                               data = tmp;
-                               success();
-                               complete();
-                               // Garbage collect
-                               window[ jsonp ] = undefined;
-                               try{ delete window[ jsonp ]; } catch(e){}
-                               if ( head )
-                                       head.removeChild( script );
+       // Serialize an array of form elements or a set of
+       // key/values into a query string
+       param: function( a, traditional ) {
+               var s = [],
+                       add = function( key, value ) {
+                               // If value is a function, invoke it and return its value
+                               value = jQuery.isFunction(value) ? value() : value;
+                               s[ s.length ] = encodeURIComponent(key) + "=" + encodeURIComponent(value);
                        };
+               
+               // Set traditional to true for jQuery <= 1.3.2 behavior.
+               if ( traditional === undefined ) {
+                       traditional = jQuery.ajaxSettings.traditional;
                }
-
-               if ( s.dataType == "script" && s.cache == null )
-                       s.cache = false;
-
-               if ( s.cache === false && type == "GET" ) {
-                       var ts = now();
-                       // try replacing _= if it is there
-                       var ret = s.url.replace(/(\?|&)_=.*?(&|$)/, "$1_=" + ts + "$2");
-                       // if nothing was replaced, add timestamp to the end
-                       s.url = ret + ((ret == s.url) ? (s.url.match(/\?/) ? "&" : "?") + "_=" + ts : "");
-               }
-
-               // If data is available, append data to url for get requests
-               if ( s.data && type == "GET" ) {
-                       s.url += (s.url.match(/\?/) ? "&" : "?") + s.data;
-
-                       // IE likes to send both get and post data, prevent this
-                       s.data = null;
-               }
-
-               // Watch for a new set of requests
-               if ( s.global && ! jQuery.active++ )
-                       jQuery.event.trigger( "ajaxStart" );
-
-               // Matches an absolute URL, and saves the domain
-               var remote = /^(?:\w+:)?\/\/([^\/?#]+)/;
-
-               // If we're requesting a remote document
-               // and trying to load JSON or Script with a GET
-               if ( s.dataType == "script" && type == "GET"
-                               && remote.test(s.url) && remote.exec(s.url)[1] != location.host ){
-                       var head = document.getElementsByTagName("head")[0];
-                       var script = document.createElement("script");
-                       script.src = s.url;
-                       if (s.scriptCharset)
-                               script.charset = s.scriptCharset;
-
-                       // Handle Script loading
-                       if ( !jsonp ) {
-                               var done = false;
-
-                               // Attach handlers for all browsers
-                               script.onload = script.onreadystatechange = function(){
-                                       if ( !done && (!this.readyState ||
-                                                       this.readyState == "loaded" || this.readyState == "complete") ) {
-                                               done = true;
-                                               success();
-                                               complete();
-                                               head.removeChild( script );
-                                       }
-                               };
+               
+               // If an array was passed in, assume that it is an array of form elements.
+               if ( jQuery.isArray(a) || a.jquery ) {
+                       // Serialize the form elements
+                       jQuery.each( a, function() {
+                               add( this.name, this.value );
+                       });
+                       
+               } else {
+                       // If traditional, encode the "old" way (the way 1.3.2 or older
+                       // did it), otherwise encode params recursively.
+                       for ( var prefix in a ) {
+                               buildParams( prefix, a[prefix], traditional, add );
                        }
-
-                       head.appendChild(script);
-
-                       // We handle everything using the script element injection
-                       return undefined;
-               }
-
-               var requestDone = false;
-
-               // Create the request object; Microsoft failed to properly
-               // implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available
-               var xml = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
-
-               // Open the socket
-               // Passing null username, generates a login popup on Opera (#2865)
-               if( s.username )
-                       xml.open(type, s.url, s.async, s.username, s.password);
-               else
-                       xml.open(type, s.url, s.async);
-
-               // Need an extra try/catch for cross domain requests in Firefox 3
-               try {
-                       // Set the correct header, if data is being sent
-                       if ( s.data )
-                               xml.setRequestHeader("Content-Type", s.contentType);
-
-                       // Set the If-Modified-Since header, if ifModified mode.
-                       if ( s.ifModified )
-                               xml.setRequestHeader("If-Modified-Since",
-                                       jQuery.lastModified[s.url] || "Thu, 01 Jan 1970 00:00:00 GMT" );
-
-                       // Set header so the called script knows that it's an XMLHttpRequest
-                       xml.setRequestHeader("X-Requested-With", "XMLHttpRequest");
-
-                       // Set the Accepts header for the server, depending on the dataType
-                       xml.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ?
-                               s.accepts[ s.dataType ] + ", */*" :
-                               s.accepts._default );
-               } catch(e){}
-
-               // Allow custom headers/mimetypes
-               if ( s.beforeSend && s.beforeSend(xml, s) === false ) {
-                       // cleanup active request counter
-                       s.global && jQuery.active--;
-                       // close opended socket
-                       xml.abort();
-                       return false;
                }
 
-               if ( s.global )
-                       jQuery.event.trigger("ajaxSend", [xml, s]);
-
-               // Wait for a response to come back
-               var onreadystatechange = function(isTimeout){
-                       // The transfer is complete and the data is available, or the request timed out
-                       if ( !requestDone && xml && (xml.readyState == 4 || isTimeout == "timeout") ) {
-                               requestDone = true;
-
-                               // clear poll interval
-                               if (ival) {
-                                       clearInterval(ival);
-                                       ival = null;
-                               }
+               // Return the resulting serialization
+               return s.join("&").replace(r20, "+");
+       }
+});
 
-                               status = isTimeout == "timeout" && "timeout" ||
-                                       !jQuery.httpSuccess( xml ) && "error" ||
-                                       s.ifModified && jQuery.httpNotModified( xml, s.url ) && "notmodified" ||
-                                       "success";
-
-                               if ( status == "success" ) {
-                                       // Watch for, and catch, XML document parse errors
-                                       try {
-                                               // process the data (runs the xml through httpData regardless of callback)
-                                               data = jQuery.httpData( xml, s.dataType );
-                                       } catch(e) {
-                                               status = "parsererror";
-                                       }
-                               }
+function buildParams( prefix, obj, traditional, add ) {
+       if ( jQuery.isArray(obj) && obj.length ) {
+               // Serialize array item.
+               jQuery.each( obj, function( i, v ) {
+                       if ( traditional || rbracket.test( prefix ) ) {
+                               // Treat each array item as a scalar.
+                               add( prefix, v );
 
-                               // Make sure that the request was successful or notmodified
-                               if ( status == "success" ) {
-                                       // Cache Last-Modified header, if ifModified mode.
-                                       var modRes;
-                                       try {
-                                               modRes = xml.getResponseHeader("Last-Modified");
-                                       } catch(e) {} // swallow exception thrown by FF if header is not available
-
-                                       if ( s.ifModified && modRes )
-                                               jQuery.lastModified[s.url] = modRes;
-
-                                       // JSONP handles its own success callback
-                                       if ( !jsonp )
-                                               success();
-                               } else
-                                       jQuery.handleError(s, xml, status);
-
-                               // Fire the complete handlers
-                               complete();
-
-                               // Stop memory leaks
-                               if ( s.async )
-                                       xml = null;
+                       } else {
+                               // If array item is non-scalar (array or object), encode its
+                               // numeric index to resolve deserialization ambiguity issues.
+                               // Note that rack (as of 1.0.0) can't currently deserialize
+                               // nested arrays properly, and attempting to do so may cause
+                               // a server error. Possible fixes are to modify rack's
+                               // deserialization algorithm or to provide an option or flag
+                               // to force array serialization to be shallow.
+                               buildParams( prefix + "[" + ( typeof v === "object" || jQuery.isArray(v) ? i : "" ) + "]", v, traditional, add );
                        }
-               };
-
-               if ( s.async ) {
-                       // don't attach the handler to the request, just poll it instead
-                       var ival = setInterval(onreadystatechange, 13);
-
-                       // Timeout checker
-                       if ( s.timeout > 0 )
-                               setTimeout(function(){
-                                       // Check to see if the request is still happening
-                                       if ( xml ) {
-                                               // Cancel the request
-                                               xml.abort();
-
-                                               if( !requestDone )
-                                                       onreadystatechange( "timeout" );
-                                       }
-                               }, s.timeout);
-               }
-
-               // Send the data
-               try {
-                       xml.send(s.data);
-               } catch(e) {
-                       jQuery.handleError(s, xml, null, e);
-               }
-
-               // firefox 1.5 doesn't fire statechange for sync requests
-               if ( !s.async )
-                       onreadystatechange();
-
-               function success(){
-                       // If a local callback was specified, fire it and pass it the data
-                       if ( s.success )
-                               s.success( data, status );
-
-                       // Fire the global callback
-                       if ( s.global )
-                               jQuery.event.trigger( "ajaxSuccess", [xml, s] );
-               }
-
-               function complete(){
-                       // Process result
-                       if ( s.complete )
-                               s.complete(xml, status);
-
-                       // The request was completed
-                       if ( s.global )
-                               jQuery.event.trigger( "ajaxComplete", [xml, s] );
-
-                       // Handle the global AJAX counter
-                       if ( s.global && ! --jQuery.active )
-                               jQuery.event.trigger( "ajaxStop" );
+               });
+                       
+       } else if ( !traditional && obj != null && typeof obj === "object" ) {
+               // If we see an array here, it is empty and should be treated as an empty
+               // object
+               if ( jQuery.isArray( obj ) || jQuery.isEmptyObject( obj ) ) {
+                       add( prefix, "" );
+
+               // Serialize object item.
+               } else {
+                       jQuery.each( obj, function( k, v ) {
+                               buildParams( prefix + "[" + k + "]", v, traditional, add );
+                       });
                }
+                                       
+       } else {
+               // Serialize scalar item.
+               add( prefix, obj );
+       }
+}
 
-               // return XMLHttpRequest to allow aborting the request etc.
-               return xml;
-       },
-
-       handleError: function( s, xml, status, e ) {
-               // If a local callback was specified, fire it
-               if ( s.error ) s.error( xml, status, e );
-
-               // Fire the global callback
-               if ( s.global )
-                       jQuery.event.trigger( "ajaxError", [xml, s, e] );
-       },
+// This is still on the jQuery object... for now
+// Want to move this to jQuery.ajax some day
+jQuery.extend({
 
        // Counter for holding the number of active queries
        active: 0,
 
-       // Determines if an XMLHttpRequest was successful or not
-       httpSuccess: function( r ) {
-               try {
-                       // IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
-                       return !r.status && location.protocol == "file:" ||
-                               ( r.status >= 200 && r.status < 300 ) || r.status == 304 || r.status == 1223 ||
-                               jQuery.browser.safari && r.status == undefined;
-               } catch(e){}
-               return false;
-       },
-
-       // Determines if an XMLHttpRequest returns NotModified
-       httpNotModified: function( xml, url ) {
-               try {
-                       var xmlRes = xml.getResponseHeader("Last-Modified");
-
-                       // Firefox always returns 200. check Last-Modified date
-                       return xml.status == 304 || xmlRes == jQuery.lastModified[url] ||
-                               jQuery.browser.safari && xml.status == undefined;
-               } catch(e){}
-               return false;
-       },
-
-       httpData: function( r, type ) {
-               var ct = r.getResponseHeader("content-type"),
-                       xml = type == "xml" || !type && ct && ct.indexOf("xml") >= 0,
-                       data = xml ? r.responseXML : r.responseText;
-
-               if ( xml && data.documentElement.tagName == "parsererror" )
-                       throw "parsererror";
-
-               // If the type is "script", eval it in global context
-               if ( type == "script" )
-                       jQuery.globalEval( data );
-
-               // Get the JavaScript object, if JSON is used.
-               if ( type == "json" )
-                       data = eval("(" + data + ")");
+       // Last-Modified header cache for next request
+       lastModified: {},
+       etag: {}
 
-               return data;
-       },
+});
 
-       // Serialize an array of form elements or a set of
-       // key/values into a query string
-       param: function( a ) {
-               var s = [];
+/*
+ * Create the request object; Microsoft failed to properly
+ * implement the XMLHttpRequest in IE7 (can't request local files),
+ * so we use the ActiveXObject when it is available
+ * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
+ * we need a fallback.
+ */
+if ( window.ActiveXObject ) {
+       jQuery.ajaxSettings.xhr = function() {
+       if ( window.location.protocol !== "file:" ) {
+               try {
+                       return new window.XMLHttpRequest();
+               } catch( xhrError ) {}
+       }
+       
+       try {
+               return new window.ActiveXObject("Microsoft.XMLHTTP");
+       } catch( activeError ) {}
+       };
+}
 
-               // If an array was passed in, assume that it is an array
-               // of form elements
-               if ( a.constructor == Array || a.jquery )
-                       // Serialize the form elements
-                       jQuery.each( a, function(){
-                               s.push( encodeURIComponent(this.name) + "=" + encodeURIComponent( this.value ) );
-                       });
+var testXHR = jQuery.ajaxSettings.xhr();
 
-               // 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] && a[j].constructor == Array )
-                                       jQuery.each( a[j], function(){
-                                               s.push( encodeURIComponent(j) + "=" + encodeURIComponent( this ) );
-                                       });
-                               else
-                                       s.push( encodeURIComponent(j) + "=" + encodeURIComponent( jQuery.isFunction(a[j]) ? a[j]() : a[j] ) );
+// Does this browser support XHR requests?
+jQuery.support.ajax = !!testXHR;
 
-               // Return the resulting serialization
-               return s.join("&").replace(/%20/g, "+");
-       }
+// Does this browser support crossDomain XHR requests
+jQuery.support.cors = testXHR && "withCredentials" in testXHR;
 
-});
+})( jQuery );