X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=0d1dd84cca03724e360281db9cd41614802f65ab;hb=61e37d41490aed319a176c6ca7feb95e5505059c;hp=353c824ff7db7a3bbfe765c66ff4290a27869f85;hpb=513053d62ba86ca6ab1f4646fdac3ec6819b2db9;p=jquery.git diff --git a/src/ajax.js b/src/ajax.js index 353c824..0d1dd84 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -1,7 +1,7 @@ var jsc = now(), - rscript = //g, + rscript = //gi, rselectTextarea = /select|textarea/i, - rinput = /text|hidden|password|search/i, + rinput = /color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i, jsre = /=\?(&|$)/, rquery = /\?/, rts = /(\?|&)_=.*?(&|$)/, @@ -15,6 +15,10 @@ jQuery.fn.extend({ load: function( url, params, callback ) { if ( typeof url !== "string" ) { return this._load( url ); + + // Don't do a request if no elements are being requested + } else if ( !this.length ) { + return this; } var off = url.indexOf(" "); @@ -48,7 +52,7 @@ jQuery.fn.extend({ dataType: "html", data: params, context:this, - complete: function(res, status){ + 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 @@ -79,31 +83,31 @@ jQuery.fn.extend({ return jQuery.param(this.serializeArray()); }, serializeArray: function() { - return this.map(function(){ + return this.map(function() { return this.elements ? jQuery.makeArray(this.elements) : this; }) - .filter(function(){ + .filter(function() { return this.name && !this.disabled && (this.checked || rselectTextarea.test(this.nodeName) || rinput.test(this.type)); }) - .map(function(i, elem){ + .map(function( i, elem ) { var val = jQuery(this).val(); return val == null ? null : jQuery.isArray(val) ? - jQuery.map( val, function(val, i){ - return {name: elem.name, value: val}; + jQuery.map( val, function( val, i ) { + return { name: elem.name, value: val }; }) : - {name: elem.name, value: val}; + { name: elem.name, value: val }; }).get(); } }); // Attach a bunch of functions for handling common AJAX events -jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), function(i,o){ - jQuery.fn[o] = function(f){ +jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), function( i, o ) { + jQuery.fn[o] = function( f ) { return this.bind(o, f); }; }); @@ -172,7 +176,7 @@ jQuery.extend({ // Create the request object; Microsoft failed to properly // implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available // This function can be overriden by calling jQuery.ajaxSetup - xhr: function(){ + xhr: function() { return window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest(); @@ -191,13 +195,11 @@ jQuery.extend({ lastModified: {}, etag: {}, - 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)); + ajax: function( origSettings ) { + var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings); var jsonp, status, data, - callbackContext = s.context || window, + callbackContext = s.context || s, type = s.type.toUpperCase(); // convert data if not already a string @@ -219,7 +221,7 @@ jQuery.extend({ // Build temporary JSONP function if ( s.dataType === "json" && (s.data && jsre.test(s.data) || jsre.test(s.url)) ) { - jsonp = "jsonp" + jsc++; + jsonp = s.jsonpCallback || ("jsonp" + jsc++); // Replace the =? sequence both in the query string and the data if ( s.data ) { @@ -233,13 +235,17 @@ jQuery.extend({ s.dataType = "script"; // Handle JSONP-style loading - window[ jsonp ] = function(tmp){ + window[ jsonp ] = window[ jsonp ] || function( tmp ) { data = tmp; success(); complete(); // Garbage collect window[ jsonp ] = undefined; - try{ delete window[ jsonp ]; } catch(e){} + + try { + delete window[ jsonp ]; + } catch(e) {} + if ( head ) { head.removeChild( script ); } @@ -271,13 +277,12 @@ jQuery.extend({ } // Matches an absolute URL, and saves the domain - var parts = rurl.exec( s.url ); + var parts = rurl.exec( s.url ), + remote = parts && (parts[1] && parts[1] !== location.protocol || parts[2] !== location.host); // If we're requesting a remote document // and trying to load JSON or Script with a GET - if ( s.dataType === "script" && type === "GET" && parts - && ( parts[1] && parts[1] !== location.protocol || parts[2] !== location.host )) { - + if ( s.dataType === "script" && type === "GET" && remote ) { var head = document.getElementsByTagName("head")[0] || document.documentElement; var script = document.createElement("script"); script.src = s.url; @@ -290,7 +295,7 @@ jQuery.extend({ var done = false; // Attach handlers for all browsers - script.onload = script.onreadystatechange = function(){ + script.onload = script.onreadystatechange = function() { if ( !done && (!this.readyState || this.readyState === "loaded" || this.readyState === "complete") ) { done = true; @@ -330,29 +335,32 @@ jQuery.extend({ // 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 ) { + if ( s.data || origSettings && origSettings.contentType ) { xhr.setRequestHeader("Content-Type", s.contentType); } - // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode. - if ( s.ifModified ) { - if ( jQuery.lastModified[s.url] ) { - xhr.setRequestHeader("If-Modified-Since", jQuery.lastModified[s.url]); - } + // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode. + if ( s.ifModified ) { + if ( jQuery.lastModified[s.url] ) { + 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.etag[s.url] ) { + xhr.setRequestHeader("If-None-Match", jQuery.etag[s.url]); } + } // Set header so the called script knows that it's an XMLHttpRequest - xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest"); + // Only send the header if it's not a remote XHR + if ( !remote ) { + xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest"); + } // Set the Accepts header for the server, depending on the dataType xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ? s.accepts[ s.dataType ] + ", */*" : s.accepts._default ); - } catch(e){} + } catch(e) {} // Allow custom headers/mimetypes and early abort if ( s.beforeSend && s.beforeSend.call(callbackContext, xhr, s) === false ) { @@ -371,7 +379,7 @@ jQuery.extend({ } // Wait for a response to come back - var onreadystatechange = function(isTimeout){ + var onreadystatechange = function( isTimeout ) { // The request was aborted, clear the interval and decrement jQuery.active if ( !xhr || xhr.readyState === 0 ) { if ( ival ) { @@ -426,7 +434,7 @@ jQuery.extend({ // Fire the complete handlers complete(); - if ( isTimeout ) { + if ( isTimeout === "timeout" ) { xhr.abort(); } @@ -443,7 +451,7 @@ jQuery.extend({ // Timeout checker if ( s.timeout > 0 ) { - setTimeout(function(){ + setTimeout(function() { // Check to see if the request is still happening if ( xhr && !requestDone ) { onreadystatechange( "timeout" ); @@ -466,10 +474,10 @@ jQuery.extend({ onreadystatechange(); } - function success(){ + function success() { // If a local callback was specified, fire it and pass it the data if ( s.success ) { - s.success.call( callbackContext, data, status ); + s.success.call( callbackContext, data, status, xhr ); } // Fire the global callback @@ -478,7 +486,7 @@ jQuery.extend({ } } - function complete(){ + function complete() { // Process result if ( s.complete ) { s.complete.call( callbackContext, xhr, status); @@ -495,7 +503,7 @@ jQuery.extend({ } } - function trigger(type, args){ + function trigger(type, args) { (s.context ? jQuery(s.context) : jQuery.event).trigger(type, args); } @@ -526,7 +534,7 @@ jQuery.extend({ // Opera returns 0 when status is 304 ( xhr.status >= 200 && xhr.status < 300 ) || xhr.status === 304 || xhr.status === 1223 || xhr.status === 0; - } catch(e){} + } catch(e) {} return false; }, @@ -587,53 +595,61 @@ jQuery.extend({ // Serialize an array of form elements or a set of // key/values into a query string param: function( a ) { + var s = [], - param_traditional = jQuery.param.traditional; + + // Set jQuery.param.traditional to true for jQuery <= 1.3.2 behavior. + traditional = jQuery.param.traditional; - function add( key, value ){ + 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 ) + // 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 - // Encode parameters from object, recursively. If - // jQuery.param.traditional is set, encode the "old" way - // (the way 1.3.2 or older did it) + } else { + // If jQuery.param.traditional is true, 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) ) - jQuery.each( obj, function(i,v){ - // Due to rails' limited request param syntax, numeric array - // indices are not supported. To avoid serialization ambiguity - // issues, serialized arrays can only contain scalar values. php - // does not have this issue, but we should go with the lowest - // common denominator - add( prefix + ( param_traditional ? "" : "[]" ), v ); + 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 ( typeof obj == "object" ) - if ( param_traditional ) - add( prefix, obj ); - - else - jQuery.each( obj, function(k,v){ - buildParams( prefix ? prefix + "[" + k + "]" : k, v ); - }); + } else if ( !traditional && typeof obj === "object" ) { + // Serialize object item. + jQuery.each( obj, function( k, v ) { + buildParams( prefix + "[" + k + "]", v ); + }); - else + } else { + // Serialize scalar item. add( prefix, obj ); - + } }); - + } + // Return the resulting serialization return s.join("&").replace(r20, "+"); }