Moved from the old JSMin to using YUIMin for compressing the jQuery source. Additiona...

[jquery.git] / src / ajax.js

diff --git a/src/ajax.js b/src/ajax.js
index 885c819..c255dfe 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -3,7 +3,7 @@ jQuery.fn.extend({
        _load: jQuery.fn.load,
 
        load: function( url, params, callback ) {
-               if ( typeof url != 'string' )
+               if ( typeof url !== "string" )
                        return this._load( url );
 
                var off = url.indexOf(" ");
@@ -12,8 +12,6 @@ jQuery.fn.extend({
                        url = url.slice(0, off);
                }
 
-               callback = callback || function(){};
-
                // Default to a GET request
                var type = "GET";
 
@@ -26,7 +24,7 @@ jQuery.fn.extend({
                                params = null;
 
                        // Otherwise, build a param string
-                       } else if( typeof params == 'object' ) {
+                       } else if( typeof params === "object" ) {
                                params = jQuery.param( params );
                                type = "POST";
                        }
@@ -56,7 +54,8 @@ jQuery.fn.extend({
                                                // 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;
@@ -67,8 +66,7 @@ jQuery.fn.extend({
        },
        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 &&
@@ -78,7 +76,7 @@ jQuery.fn.extend({
                .map(function(i, elem){
                        var val = jQuery(this).val();
                        return val == null ? null :
-                               val.constructor == Array ?
+                               jQuery.isArray(val) ?
                                        jQuery.map( val, function(val, i){
                                                return {name: elem.name, value: val};
                                        }) :
@@ -180,7 +178,7 @@ jQuery.extend({
                        type = s.type.toUpperCase();
 
                // convert data if not already a string
-               if ( s.data && s.processData && typeof s.data != "string" )
+               if ( s.data && s.processData && typeof s.data !== "string" )
                        s.data = jQuery.param(s.data);
 
                // Handle JSONP Parameter Callbacks
@@ -310,10 +308,11 @@ jQuery.extend({
                                s.accepts._default );
                } catch(e){}
 
-               // Allow custom headers/mimetypes
+               // Allow custom headers/mimetypes and early abort
                if ( s.beforeSend && s.beforeSend(xhr, s) === false ) {
-                       // cleanup active request counter
-                       s.global && jQuery.active--;
+                       // Handle the global AJAX counter
+                       if ( s.global && ! --jQuery.active )
+                               jQuery.event.trigger( "ajaxStop" );
                        // close opended socket
                        xhr.abort();
                        return false;
@@ -324,8 +323,18 @@ 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 (ival) {
+                                       // clear poll interval
+                                       clearInterval(ival);
+                                       ival = null;
+                                       // Handle the global AJAX counter
+                                       if ( s.global && ! --jQuery.active )
+                                               jQuery.event.trigger( "ajaxStop" );
+                               }
                        // The transfer is complete and the data is available, or the request timed out
-                       if ( !requestDone && xhr && (xhr.readyState == 4 || isTimeout == "timeout") ) {
+                       } else if ( !requestDone && xhr && (xhr.readyState == 4 || isTimeout == "timeout") ) {
                                requestDone = true;
 
                                // clear poll interval
@@ -384,11 +393,12 @@ jQuery.extend({
                                setTimeout(function(){
                                        // Check to see if the request is still happening
                                        if ( xhr ) {
-                                               // Cancel the request
-                                               xhr.abort();
-
                                                if( !requestDone )
                                                        onreadystatechange( "timeout" );
+
+                                               // Cancel the request
+                                               if ( xhr )
+                                                       xhr.abort();
                                        }
                                }, s.timeout);
                }
@@ -449,8 +459,7 @@ jQuery.extend({
                try {
                        // IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
                        return !xhr.status && location.protocol == "file:" ||
-                               ( xhr.status >= 200 && xhr.status < 300 ) || xhr.status == 304 || xhr.status == 1223 ||
-                               jQuery.browser.safari && xhr.status == undefined;
+                               ( xhr.status >= 200 && xhr.status < 300 ) || xhr.status == 304 || xhr.status == 1223;
                } catch(e){}
                return false;
        },
@@ -461,8 +470,7 @@ jQuery.extend({
                        var xhrRes = xhr.getResponseHeader("Last-Modified");
 
                        // Firefox always returns 200. check Last-Modified date
-                       return xhr.status == 304 || xhrRes == jQuery.lastModified[url] ||
-                               jQuery.browser.safari && xhr.status == undefined;
+                       return xhr.status == 304 || xhrRes == jQuery.lastModified[url];
                } catch(e){}
                return false;
        },
@@ -481,7 +489,7 @@ jQuery.extend({
                        data = s.dataFilter( data, type );
 
                // The filter can actually parse the response
-               if( typeof data == 'string' ){
+               if( typeof data === "string" ){
 
                        // If the type is "script", eval it in global context
                        if ( type == "script" )
@@ -489,7 +497,7 @@ jQuery.extend({
 
                        // Get the JavaScript object, if JSON is used.
                        if ( type == "json" )
-                               data = eval("(" + data + ")");
+                               data = window["eval"]("(" + data + ")");
                }
                
                return data;
@@ -506,7 +514,7 @@ jQuery.extend({
 
                // If an array was passed in, assume that it is an array
                // of form elements
-               if ( a.constructor == Array || a.jquery )
+               if ( jQuery.isArray(a) || a.jquery )
                        // Serialize the form elements
                        jQuery.each( a, function(){
                                add( this.name, this.value );
@@ -517,7 +525,7 @@ jQuery.extend({
                        // 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 )
+                               if ( jQuery.isArray(a[j]) )
                                        jQuery.each( a[j], function(){
                                                add( j, this );
                                        });