X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fajax.js;h=62b3ac000540f0ce42a21f386e5b27f8f8a44fb9;hb=766635e8624f5e61e021086de9e763f2ef6b17ef;hp=c6b8d0fa054c0bd1173efcfab07aeeaa996f15ac;hpb=8c18dcdeb08b8e2b908c17efd760ff25635f3749;p=jquery.git diff --git a/src/ajax.js b/src/ajax.js index c6b8d0f..62b3ac0 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -275,7 +275,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 ) { @@ -370,7 +370,7 @@ jQuery.extend({ // 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 ); @@ -524,11 +524,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 +588,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