X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=ca17f4f0d807fd411a3d9bc3031e4c6a6e9133fe;hb=25f9974cee5874d10df32f2d16fb985181e0c077;hp=8bf4a501f5741e05389b66fc06e22a05c08c29f0;hpb=5974495e6b1f40076ef257bc886dacd0c2e27bd7;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index 8bf4a50..ca17f4f 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -153,7 +153,7 @@ jQuery.extend({
 			script: "text/javascript, application/javascript",
 			json: "application/json, text/javascript",
 			text: "text/plain",
-			default: "*/*"
+			_default: "*/*"
 		}
 	},
 	
@@ -232,7 +232,7 @@ jQuery.extend({
 
 		// If we're requesting a remote document
 		// and trying to load JSON or Script with a GET
-		if ( (!s.url.indexOf("http") || !s.url.indexOf("//")) && ( s.dataType == "script" || s.dataType =="json" ) && s.type.toLowerCase() == "get" ) {
+		if ( (!s.url.indexOf("http") || !s.url.indexOf("//")) && s.dataType == "script" && s.type.toLowerCase() == "get" ) {
 			var head = document.getElementsByTagName("head")[0];
 			var script = document.createElement("script");
 			script.src = s.url;
@@ -287,13 +287,18 @@ jQuery.extend({
 			// Set the Accepts header for the server, depending on the dataType
 			xml.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ?
 				s.accepts[ s.dataType ] + ", */*" :
-				s.accepts.default );
+				s.accepts._default );
 		} catch(e){}
 
 		// Allow custom headers/mimetypes
-		if ( s.beforeSend )
-			s.beforeSend(xml);
-			
+		if ( s.beforeSend && s.beforeSend(xml, s) === false ) {
+			// cleanup active request counter
+			s.global && jQuery.active--;
+			// close opended socket
+			xml.abort();
+			return false;
+		}
+		
 		if ( s.global )
 			jQuery.event.trigger("ajaxSend", [xml, s]);