X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fajax%2Fxhr.js;h=a6473dd87a61557a7b0aff4f24ce74f40b01ec42;hb=a43a5ca9cf79afcd662df5b9110d7ccba45c0b53;hp=e21847aa8eaea7cee03fe14b2141076a4a5fca75;hpb=f2e0ae1a3932d6089853e8c0eed6ecb446610c00;p=jquery.git

diff --git a/src/ajax/xhr.js b/src/ajax/xhr.js
index e21847a..a6473dd 100644
--- a/src/ajax/xhr.js
+++ b/src/ajax/xhr.js
@@ -26,7 +26,7 @@ function createStandardXHR() {
 
 function createActiveXHR() {
 	try {
-		return new window.ActiveXObject("Microsoft.XMLHTTP");
+		return new window.ActiveXObject( "Microsoft.XMLHTTP" );
 	} catch( e ) {}
 }
 
@@ -166,14 +166,16 @@ if ( jQuery.support.ajax ) {
 									}
 
 									// Filter status for non standard behaviors
-									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 );
+
+									// 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)
+									if ( !status && s.isLocal && !s.crossDomain ) {
+										status = responses.text ? 200 : 404;
+									// IE - #1450: sometimes returns 1223 when it should be 204
+									} else if ( status === 1223 ) {
+										status = 204;
+									}
 								}
 							}
 						} catch( firefoxAccessException ) {