X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=0d1dd84cca03724e360281db9cd41614802f65ab;hb=61e37d41490aed319a176c6ca7feb95e5505059c;hp=edb5c54beeb1d6501021113a3edff030f34cb22b;hpb=36c99dc0c7a745a88488f519b38de811d6d4c8d9;p=jquery.git diff --git a/src/ajax.js b/src/ajax.js index edb5c54..0d1dd84 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -52,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 @@ -83,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); }; }); @@ -176,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(); @@ -235,13 +235,17 @@ jQuery.extend({ s.dataType = "script"; // Handle JSONP-style loading - window[ jsonp ] = 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 ); } @@ -291,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; @@ -356,7 +360,7 @@ jQuery.extend({ 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 ) { @@ -375,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 ) { @@ -447,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" ); @@ -470,7 +474,7 @@ 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, xhr ); @@ -482,7 +486,7 @@ jQuery.extend({ } } - function complete(){ + function complete() { // Process result if ( s.complete ) { s.complete.call( callbackContext, xhr, status); @@ -499,7 +503,7 @@ jQuery.extend({ } } - function trigger(type, args){ + function trigger(type, args) { (s.context ? jQuery(s.context) : jQuery.event).trigger(type, args); } @@ -530,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; }, @@ -597,7 +601,7 @@ jQuery.extend({ // 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); @@ -617,7 +621,7 @@ jQuery.extend({ if ( jQuery.isArray(obj) ) { // Serialize array item. - jQuery.each( obj, function(i,v){ + jQuery.each( obj, function( i, v ) { if ( traditional ) { // Treat each array item as a scalar. add( prefix, v ); @@ -635,7 +639,7 @@ jQuery.extend({ } else if ( !traditional && typeof obj === "object" ) { // Serialize object item. - jQuery.each( obj, function(k,v){ + jQuery.each( obj, function( k, v ) { buildParams( prefix + "[" + k + "]", v ); });