Simplifies status normalization in xhr transport. Local file test modified for clarity.
[jquery.git] / src / ajax / xhr.js
index 3acdc66..c48ac90 100644 (file)
@@ -1,17 +1,35 @@
 (function( jQuery ) {
 
-var // Next active xhr id
+var // #5280: next active xhr id and list of active xhrs' callbacks
        xhrId = jQuery.now(),
-
-       // active xhrs
-       xhrs = {},
-
-       // #5280: see below
-       xhrUnloadAbortInstalled,
+       xhrCallbacks,
 
        // XHR used to determine supports properties
        testXHR;
 
+// #5280: Internet Explorer will keep connections alive if we don't abort on unload
+function xhrOnUnloadAbort() {
+       jQuery( window ).unload(function() {
+               // Abort all pending requests
+               for ( var key in xhrCallbacks ) {
+                       xhrCallbacks[ key ]( 0, 1 );
+               }
+       });
+}
+
+// Functions to create xhrs
+function createStandardXHR() {
+       try {
+               return new window.XMLHttpRequest();
+       } catch( e ) {}
+}
+
+function createActiveXHR() {
+       try {
+               return new window.ActiveXObject("Microsoft.XMLHTTP");
+       } catch( e ) {}
+}
+
 // Create the request object
 // (This is still attached to ajaxSettings for backward compatibility)
 jQuery.ajaxSettings.xhr = window.ActiveXObject ?
@@ -22,27 +40,13 @@ jQuery.ajaxSettings.xhr = window.ActiveXObject ?
         * we need a fallback.
         */
        function() {
-               if ( window.location.protocol !== "file:" ) {
-                       try {
-                               return new window.XMLHttpRequest();
-                       } catch( xhrError ) {}
-               }
-
-               try {
-                       return new window.ActiveXObject("Microsoft.XMLHTTP");
-               } catch( activeError ) {}
+               return !this.isLocal && createStandardXHR() || createActiveXHR();
        } :
        // For all other browsers, use the standard XMLHttpRequest object
-       function() {
-               return new window.XMLHttpRequest();
-       };
+       createStandardXHR;
 
 // Test if we can create an xhr object
-try {
-       testXHR = jQuery.ajaxSettings.xhr();
-} catch( xhrCreationException ) {}
-
-//Does this browser support XHR requests?
+testXHR = jQuery.ajaxSettings.xhr();
 jQuery.support.ajax = !!testXHR;
 
 // Does this browser support crossDomain XHR requests
@@ -63,28 +67,19 @@ if ( jQuery.support.ajax ) {
                        return {
                                send: function( headers, complete ) {
 
-                                       // #5280: we need to abort on unload or IE will keep connections alive
-                                       if ( !xhrUnloadAbortInstalled ) {
-
-                                               xhrUnloadAbortInstalled = 1;
-
-                                               jQuery(window).bind( "unload", function() {
-
-                                                       // Abort all pending requests
-                                                       jQuery.each( xhrs, function( _, xhr ) {
-                                                               if ( xhr.onreadystatechange ) {
-                                                                       xhr.onreadystatechange( 1 );
-                                                               }
-                                                       } );
-
-                                               } );
-                                       }
-
                                        // Get a new xhr
                                        var xhr = s.xhr(),
                                                handle,
                                                i;
 
+                                       // Open the socket
+                                       // Passing null username, generates a login popup on Opera (#2865)
+                                       if ( s.username ) {
+                                               xhr.open( s.type, s.url, s.async, s.username, s.password );
+                                       } else {
+                                               xhr.open( s.type, s.url, s.async );
+                                       }
+
                                        // Apply custom fields if provided
                                        if ( s.xhrFields ) {
                                                for ( i in s.xhrFields ) {
@@ -92,12 +87,9 @@ if ( jQuery.support.ajax ) {
                                                }
                                        }
 
-                                       // Open the socket
-                                       // Passing null username, generates a login popup on Opera (#2865)
-                                       if ( s.username ) {
-                                               xhr.open( s.type, s.url, s.async, s.username, s.password );
-                                       } else {
-                                               xhr.open( s.type, s.url, s.async );
+                                       // Override mime type if needed
+                                       if ( s.mimeType && xhr.overrideMimeType ) {
+                                               xhr.overrideMimeType( s.mimeType );
                                        }
 
                                        // Requested-With header
@@ -110,9 +102,9 @@ if ( jQuery.support.ajax ) {
 
                                        // Need an extra try/catch for cross domain requests in Firefox 3
                                        try {
-                                               jQuery.each( headers, function( key, value ) {
-                                                       xhr.setRequestHeader( key, value );
-                                               } );
+                                               for ( i in headers ) {
+                                                       xhr.setRequestHeader( i, headers[ i ] );
+                                               }
                                        } catch( _ ) {}
 
                                        // Do send the request
@@ -143,7 +135,7 @@ if ( jQuery.support.ajax ) {
                                                                // Do not keep as active anymore
                                                                if ( handle ) {
                                                                        xhr.onreadystatechange = jQuery.noop;
-                                                                       delete xhrs[ handle ];
+                                                                       delete xhrCallbacks[ handle ];
                                                                }
 
                                                                // If it's an abort
@@ -153,7 +145,6 @@ if ( jQuery.support.ajax ) {
                                                                                xhr.abort();
                                                                        }
                                                                } else {
-                                                                       // Get info
                                                                        status = xhr.status;
                                                                        responseHeaders = xhr.getAllResponseHeaders();
                                                                        responses = {};
@@ -176,29 +167,13 @@ if ( jQuery.support.ajax ) {
 
                                                                        // Filter status for non standard behaviors
                                                                        status =
-                                                                               // Most browsers return 0 when it should be 200 for local files
-                                                                               // Opera returns 0 when it should be 304
-                                                                               // Webkit returns 0 for failing cross-domain no matter the real status
-                                                                               !status ?
-                                                                                       // All: for local files, 0 is a success
-                                                                                       ( location.protocol === "file:" ? 200 : (
-                                                                                               // Webkit, Firefox: filter out faulty cross-domain requests
-                                                                                               !s.crossDomain || statusText ?
-                                                                                               (
-                                                                                                       // Opera: filter out real aborts #6060
-                                                                                                       responseHeaders ?
-                                                                                                       304 :
-                                                                                                       0
-                                                                                               ) :
-                                                                                               // We assume 302 but could be anything cross-domain related
-                                                                                               302
-                                                                                       ) ) :
-                                                                                       (
-                                                                                               // IE sometimes returns 1223 when it should be 204 (see #1450)
-                                                                                               status == 1223 ?
-                                                                                                       204 :
-                                                                                                       status
-                                                                                       );
+                                                                               // If the request is local and we have data: assume a success
+                                                                               // (success with no data won't get notified, that's the best we
+                                                                               // can do given current implementations)
+                                                                               !status && s.isLocal ?
+                                                                               ( responses.text ? 200 : 404 ) :
+                                                                               // IE - #1450: sometimes returns 1223 when it should be 204
+                                                                               ( status === 1223 ? 204 : status );
                                                                }
                                                        }
                                                } catch( firefoxAccessException ) {
@@ -219,10 +194,15 @@ if ( jQuery.support.ajax ) {
                                        if ( !s.async || xhr.readyState === 4 ) {
                                                callback();
                                        } else {
-                                               // Add to list of active xhrs
+                                               // Create the active xhrs callbacks list if needed
+                                               // and attach the unload handler
+                                               if ( !xhrCallbacks ) {
+                                                       xhrCallbacks = {};
+                                                       xhrOnUnloadAbort();
+                                               }
+                                               // Add to list of active xhrs callbacks
                                                handle = xhrId++;
-                                               xhrs[ handle ] = xhr;
-                                               xhr.onreadystatechange = callback;
+                                               xhr.onreadystatechange = xhrCallbacks[ handle ] = callback;
                                        }
                                },