Use a different workaround for detecting when Opera finds a status 304 page. Fixes...

[jquery.git] / src / ajax.js

diff --git a/src/ajax.js b/src/ajax.js
index ffd870c..aa4e3ec 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -1,3 +1,5 @@
+(function( jQuery ) {
+
 var jsc = jQuery.now(),
        rscript = /<script(.|\s)*?\/script>/gi,
        rselectTextarea = /select|textarea/i,
@@ -238,23 +240,24 @@ jQuery.extend({
 
                        // Handle JSONP-style loading
                        var customJsonp = window[ jsonp ];
+
                        window[ jsonp ] = function( tmp ) {
                                data = tmp;
                                jQuery.ajax.handleSuccess( s, xhr, status, data );
                                jQuery.ajax.handleComplete( s, xhr, status, data );
                                
                                if ( jQuery.isFunction( customJsonp ) ) {
-                                   customJsonp( tmp );
-                           }
-                           else {
-                               // Garbage collect
-                               window[ jsonp ] = undefined;
-
-                               try {
-                                       delete window[ jsonp ];
-                               } catch( jsonpError ) {}
-                }
-                
+                                       customJsonp( tmp );
+
+                               } else {
+                                       // Garbage collect
+                                       window[ jsonp ] = undefined;
+
+                                       try {
+                                               delete window[ jsonp ];
+                                       } catch( jsonpError ) {}
+                               }
+                               
                                if ( head ) {
                                        head.removeChild( script );
                                }
@@ -444,8 +447,9 @@ jQuery.extend({
 
                                // Fire the complete handlers
                                if ( !jsonp ) {
-                                   jQuery.ajax.handleComplete( s, xhr, status, data );
-                }
+                                       jQuery.ajax.handleComplete( s, xhr, status, data );
+                               }
+
                                if ( isTimeout === "timeout" ) {
                                        xhr.abort();
                                }
@@ -482,7 +486,7 @@ jQuery.extend({
 
                // Send the data
                try {
-                       xhr.send( type === "POST" || type === "PUT" || type === "DELETE" ? s.data : null );
+                       xhr.send( (type !== "GET" && s.data) || null );
 
                } catch( sendError ) {
                        jQuery.ajax.handleError( s, xhr, null, e );
@@ -625,9 +629,11 @@ jQuery.extend( jQuery.ajax, {
                try {
                        // IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
                        return !xhr.status && location.protocol === "file:" ||
-                               // Opera returns 0 when status is 304
                                ( xhr.status >= 200 && xhr.status < 300 ) ||
-                               xhr.status === 304 || xhr.status === 1223 || xhr.status === 0;
+                               xhr.status === 304 || xhr.status === 1223 ||
+                               // Opera returns a status of 0 for redirects -
+                               // We can detect this by the fact that Opera also doesn't return any headers
+                               xhr.status === 0 && !xhr.getAllResponseHeaders();
                } catch(e) {}
 
                return false;
@@ -647,7 +653,7 @@ jQuery.extend( jQuery.ajax, {
                }
 
                // Opera returns 0 when status is 304
-               return xhr.status === 304 || xhr.status === 0;
+               return xhr.status === 304 || xhr.status === 0 && !xhr.getAllResponseHeaders();
        },
 
        httpData: function( xhr, type, s ) {
@@ -682,5 +688,10 @@ jQuery.extend( jQuery.ajax, {
 
 });
 
+// Does this browser support XHR requests?
+jQuery.support.ajax = !!jQuery.ajaxSettings.xhr();
+
 // For backwards compatibility
 jQuery.extend( jQuery.ajax );
+
+})( jQuery );