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 4135e34..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(" ");
@@ -24,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";
                        }
@@ -178,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
@@ -393,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);
                }
@@ -458,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;
        },
@@ -470,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;
        },
@@ -490,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" )
@@ -498,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;