X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=47f243e55a4492f0126835a602b627132e45cf27;hb=c34a62f8abbd9598e7a6647754c449ce92418b3a;hp=b5adf2c7fdb44e43e719789e71d173f95d6863a2;hpb=3f648c4e3abe236b8ec6a19822313be794e5a9df;p=jquery.git diff --git a/src/ajax.js b/src/ajax.js index b5adf2c..47f243e 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -1,20 +1,20 @@ -var jsc = now(), +var jsc = jQuery.now(), rscript = //gi, rselectTextarea = /select|textarea/i, rinput = /color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i, - jsre = /=\?(&|$)/, + jsre = /\=\?(&|$)/, rquery = /\?/, rts = /(\?|&)_=.*?(&|$)/, rurl = /^(\w+:)?\/\/([^\/?#]+)/, - r20 = /%20/g; + r20 = /%20/g, -jQuery.fn.extend({ - // Keep a copy of the old load - _load: jQuery.fn.load, + // 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 ) { @@ -45,18 +45,19 @@ 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 - this.html( selector ? + self.html( selector ? // Create a dummy div to hold the results jQuery("
") // inject the contents of the document in, removing the scripts @@ -71,7 +72,7 @@ jQuery.fn.extend({ } if ( callback ) { - this.each( callback, [res.responseText, status, res] ); + self.each( callback, [res.responseText, status, res] ); } } }); @@ -82,6 +83,7 @@ jQuery.fn.extend({ serialize: function() { return jQuery.param(this.serializeArray()); }, + serializeArray: function() { return this.map(function() { return this.elements ? jQuery.makeArray(this.elements) : this; @@ -113,7 +115,6 @@ jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".sp }); jQuery.extend({ - get: function( url, data, callback, type ) { // shift arguments if data argument was omited if ( jQuery.isFunction( data ) ) { @@ -178,16 +179,15 @@ jQuery.extend({ // implement the XMLHttpRequest in IE7 (can't request local files), // so we use the ActiveXObject when it is available // This function can be overriden by calling jQuery.ajaxSetup - xhr: function() { - if ( window.XMLHttpRequest && (window.location.protocol !== "file:" || !window.ActiveXObject) ) { + xhr: window.XMLHttpRequest && (window.location.protocol !== "file:" || !window.ActiveXObject) ? + function() { return new window.XMLHttpRequest(); - - } else { + } : + function() { try { return new window.ActiveXObject("Microsoft.XMLHTTP"); } catch(e) {} - } - }, + }, accepts: { xml: "application/xml, text/xml", html: "text/html", @@ -198,16 +198,11 @@ jQuery.extend({ } }, - // Last-Modified header cache for next request - lastModified: {}, - etag: {}, - ajax: function( origSettings ) { - var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings); - - var jsonp, status, data, - callbackContext = s.context || s, - type = s.type.toUpperCase(); + var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings), + jsonp, status, data, type = s.type.toUpperCase(); + + s.context = origSettings && origSettings.context || s; // convert data if not already a string if ( s.data && s.processData && typeof s.data !== "string" ) { @@ -242,17 +237,25 @@ jQuery.extend({ s.dataType = "script"; // Handle JSONP-style loading - window[ jsonp ] = window[ jsonp ] || function( tmp ) { + var customJsonp = window[ jsonp ]; + + window[ jsonp ] = function( tmp ) { data = tmp; - success(); - complete(); - // Garbage collect - window[ jsonp ] = undefined; + jQuery.ajax.handleSuccess( s, xhr, status, data ); + jQuery.ajax.handleComplete( s, xhr, status, data ); + + if ( jQuery.isFunction( customJsonp ) ) { + customJsonp( tmp ); - try { - delete window[ jsonp ]; - } catch(e) {} + } else { + // Garbage collect + window[ jsonp ] = undefined; + try { + delete window[ jsonp ]; + } catch( jsonpError ) {} + } + if ( head ) { head.removeChild( script ); } @@ -264,7 +267,7 @@ jQuery.extend({ } if ( s.cache === false && type === "GET" ) { - var ts = now(); + var ts = jQuery.now(); // try replacing _= if it is there var ret = s.url.replace(rts, "$1_=" + ts + "$2"); @@ -279,7 +282,7 @@ jQuery.extend({ } // Watch for a new set of requests - if ( s.global && ! jQuery.active++ ) { + if ( s.global && jQuery.ajax.active++ === 0 ) { jQuery.event.trigger( "ajaxStart" ); } @@ -306,8 +309,8 @@ jQuery.extend({ if ( !done && (!this.readyState || this.readyState === "loaded" || this.readyState === "complete") ) { done = true; - success(); - complete(); + jQuery.ajax.handleSuccess( s, xhr, status, data ); + jQuery.ajax.handleComplete( s, xhr, status, data ); // Handle memory leak in IE script.onload = script.onreadystatechange = null; @@ -356,8 +359,8 @@ jQuery.extend({ xhr.setRequestHeader("If-Modified-Since", jQuery.lastModified[s.url]); } - if ( jQuery.etag[s.url] ) { - xhr.setRequestHeader("If-None-Match", jQuery.etag[s.url]); + if ( jQuery.ajax.etag[s.url] ) { + xhr.setRequestHeader("If-None-Match", jQuery.ajax.etag[s.url]); } } @@ -371,12 +374,12 @@ jQuery.extend({ xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ? s.accepts[ s.dataType ] + ", */*" : s.accepts._default ); - } catch(e) {} + } catch( headerError ) {} // Allow custom headers/mimetypes and early abort - if ( s.beforeSend && s.beforeSend.call(callbackContext, xhr, s) === false ) { + if ( s.beforeSend && s.beforeSend.call(s.context, xhr, s) === false ) { // Handle the global AJAX counter - if ( s.global && ! --jQuery.active ) { + if ( s.global && jQuery.ajax.active-- === 1 ) { jQuery.event.trigger( "ajaxStop" ); } @@ -386,19 +389,22 @@ jQuery.extend({ } if ( s.global ) { - trigger("ajaxSend", [xhr, s]); + jQuery.ajax.triggerGlobal( s, "ajaxSend", [xhr, s] ); } // Wait for a response to come back var onreadystatechange = xhr.onreadystatechange = function( isTimeout ) { - // The request was aborted, clear the interval and decrement jQuery.active - if ( !xhr || xhr.readyState === 0 ) { - requestDone = true; - xhr.onreadystatechange = jQuery.noop; + // The request was aborted + if ( !xhr || xhr.readyState === 0 || isTimeout === "abort" ) { + // Opera doesn't call onreadystatechange before this point + // so we simulate the call + if ( !requestDone ) { + jQuery.ajax.handleComplete( s, xhr, status, data ); + } - // Handle the global AJAX counter - if ( s.global && ! --jQuery.active ) { - jQuery.event.trigger( "ajaxStop" ); + requestDone = true; + if ( xhr ) { + xhr.onreadystatechange = jQuery.noop; } // The transfer is complete and the data is available, or the request timed out @@ -408,19 +414,22 @@ jQuery.extend({ status = isTimeout === "timeout" ? "timeout" : - !jQuery.httpSuccess( xhr ) ? + !jQuery.ajax.httpSuccess( xhr ) ? "error" : - s.ifModified && jQuery.httpNotModified( xhr, s.url ) ? + s.ifModified && jQuery.ajax.httpNotModified( xhr, s.url ) ? "notmodified" : "success"; + var errMsg; + 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( xhr, s.dataType, s ); - } catch(e) { + data = jQuery.ajax.httpData( xhr, s.dataType, s ); + } catch( parserError ) { status = "parsererror"; + errMsg = parserError; } } @@ -428,14 +437,16 @@ jQuery.extend({ if ( status === "success" || status === "notmodified" ) { // JSONP handles its own success callback if ( !jsonp ) { - success(); + jQuery.ajax.handleSuccess( s, xhr, status, data ); } } else { - jQuery.handleError(s, xhr, status); + jQuery.ajax.handleError( s, xhr, status, errMsg ); } // Fire the complete handlers - complete(); + if ( !jsonp ) { + jQuery.ajax.handleComplete( s, xhr, status, data ); + } if ( isTimeout === "timeout" ) { xhr.abort(); @@ -448,6 +459,19 @@ jQuery.extend({ } }; + // Override the abort handler, if we can (IE doesn't allow it, but that's OK) + // Opera doesn't fire onreadystatechange at all on abort + try { + var oldAbort = xhr.abort; + xhr.abort = function() { + if ( xhr ) { + oldAbort.call( xhr ); + } + + onreadystatechange( "abort" ); + }; + } catch( abortError ) {} + // Timeout checker if ( s.async && s.timeout > 0 ) { setTimeout(function() { @@ -460,11 +484,13 @@ jQuery.extend({ // Send the data try { - xhr.send( type === "POST" || type === "PUT" ? s.data : null ); - } catch(e) { - jQuery.handleError(s, xhr, null, e); + xhr.send( type === "POST" || type === "PUT" || type === "DELETE" ? s.data : null ); + + } catch( sendError ) { + jQuery.ajax.handleError( s, xhr, null, e ); + // Fire the complete handlers - complete(); + jQuery.ajax.handleComplete( s, xhr, status, data ); } // firefox 1.5 doesn't fire statechange for sync requests @@ -472,57 +498,129 @@ jQuery.extend({ onreadystatechange(); } - function success() { - // If a local callback was specified, fire it and pass it the data - if ( s.success ) { - s.success.call( callbackContext, data, status, xhr ); - } + // return XMLHttpRequest to allow aborting the request etc. + return xhr; + }, - // Fire the global callback - if ( s.global ) { - trigger( "ajaxSuccess", [xhr, s] ); + // 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 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 ); } } - function complete() { - // Process result - if ( s.complete ) { - s.complete.call( callbackContext, xhr, status); - } + // Return the resulting serialization + return s.join("&").replace(r20, "+"); + } +}); - // The request was completed - if ( s.global ) { - trigger( "ajaxComplete", [xhr, s] ); - } +function buildParams( prefix, obj, traditional, add ) { + if ( jQuery.isArray(obj) ) { + // Serialize array item. + jQuery.each( obj, function( i, v ) { + if ( traditional || /\[\]$/.test( prefix ) ) { + // Treat each array item as a scalar. + add( prefix, v ); - // Handle the global AJAX counter - if ( s.global && ! --jQuery.active ) { - jQuery.event.trigger( "ajaxStop" ); + } 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 ); } - } - - function trigger(type, args) { - (s.context ? jQuery(s.context) : jQuery.event).trigger(type, args); - } + }); + + } else if ( !traditional && obj != null && typeof obj === "object" ) { + // Serialize object item. + 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 xhr; - }, +jQuery.extend( jQuery.ajax, { + + // Counter for holding the number of active queries + active: 0, + + // Last-Modified header cache for next request + lastModified: {}, + etag: {}, handleError: function( s, xhr, status, e ) { // If a local callback was specified, fire it if ( s.error ) { - s.error.call( s.context || window, xhr, status, e ); + s.error.call( s.context, xhr, status, e ); } // Fire the global callback if ( s.global ) { - (s.context ? jQuery(s.context) : jQuery.event).trigger( "ajaxError", [xhr, s, e] ); + jQuery.ajax.triggerGlobal( s, "ajaxError", [xhr, s, e] ); } }, - // Counter for holding the number of active queries - active: 0, + handleSuccess: function( s, xhr, status, data ) { + // If a local callback was specified, fire it and pass it the data + if ( s.success ) { + s.success.call( s.context, data, status, xhr ); + } + + // Fire the global callback + if ( s.global ) { + jQuery.ajax.triggerGlobal( s, "ajaxSuccess", [xhr, s] ); + } + }, + + handleComplete: function( s, xhr, status ) { + // Process result + if ( s.complete ) { + s.complete.call( s.context, xhr, status ); + } + + // The request was completed + if ( s.global ) { + jQuery.ajax.triggerGlobal( s, "ajaxComplete", [xhr, s] ); + } + + // Handle the global AJAX counter + if ( s.global && jQuery.ajax.active-- === 1 ) { + jQuery.event.trigger( "ajaxStop" ); + } + }, + + triggerGlobal: function( s, type, args ) { + (s.context && s.context.url == null ? jQuery(s.context) : jQuery.event).trigger(type, args); + }, // Determines if an XMLHttpRequest was successful or not httpSuccess: function( xhr ) { @@ -543,11 +641,11 @@ jQuery.extend({ etag = xhr.getResponseHeader("Etag"); if ( lastModified ) { - jQuery.lastModified[url] = lastModified; + jQuery.ajax.lastModified[url] = lastModified; } if ( etag ) { - jQuery.etag[url] = etag; + jQuery.ajax.etag[url] = etag; } // Opera returns 0 when status is 304 @@ -555,12 +653,12 @@ jQuery.extend({ }, httpData: function( xhr, type, s ) { - var ct = xhr.getResponseHeader("content-type"), - xml = type === "xml" || !type && ct && ct.indexOf("xml") >= 0, + var ct = xhr.getResponseHeader("content-type") || "", + xml = type === "xml" || !type && ct.indexOf("xml") >= 0, data = xml ? xhr.responseXML : xhr.responseText; if ( xml && data.documentElement.nodeName === "parsererror" ) { - throw "parsererror"; + jQuery.error( "parsererror" ); } // Allow a pre-filtering function to sanitize the response @@ -571,87 +669,20 @@ jQuery.extend({ // The filter can actually parse the response if ( typeof data === "string" ) { + // Get the JavaScript object, if JSON is used. + if ( type === "json" || !type && ct.indexOf("json") >= 0 ) { + data = jQuery.parseJSON( data ); // If the type is "script", eval it in global context - if ( type === "script" ) { + } else if ( type === "script" || !type && ct.indexOf("javascript") >= 0 ) { jQuery.globalEval( data ); } - - // Get the JavaScript object, if JSON is used. - if ( type === "json" ) { - if ( typeof JSON === "object" && JSON.parse ) { - data = JSON.parse( data ); - } else { - data = (new Function("return " + data))(); - } - } } return data; - }, - - // Serialize an array of form elements or a set of - // key/values into a query string - param: function( a, traditional ) { - - var s = []; - - // Set traditional to true for jQuery <= 1.3.2 behavior. - if ( traditional === undefined ) { - traditional = jQuery.ajaxSettings.traditional; - } - - function add( 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); - } - - // 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. - jQuery.each( a, function buildParams( prefix, obj ) { - - if ( jQuery.isArray(obj) ) { - // Serialize array item. - jQuery.each( obj, function( i, v ) { - if ( traditional ) { - // Treat each array item as a scalar. - add( prefix, v ); - } 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 ); - } - }); - - } else if ( !traditional && typeof obj === "object" ) { - // Serialize object item. - jQuery.each( obj, function( k, v ) { - buildParams( prefix + "[" + k + "]", v ); - }); - - } else { - // Serialize scalar item. - add( prefix, obj ); - } - }); - } - - // Return the resulting serialization - return s.join("&").replace(r20, "+"); } }); + +// For backwards compatibility +jQuery.extend( jQuery.ajax );