X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fajax.js;h=3e72488036aa9bbdde8fa691466b31df06a91601;hb=0635df43914eec10e4b468ddb2f952f5024c644e;hp=58c6b9b3c95be575db7896a626d7dc52c94fa2d8;hpb=b91eef070db6ebe1ef7654e24c33d6eb9f0fca80;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index 58c6b9b..3e72488 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -146,7 +146,15 @@ jQuery.extend({
 		async: true,
 		data: null,
 		username: null,
-		password: null
+		password: null,
+		accepts: {
+			xml: "application/xml, text/xml",
+			html: "text/html",
+			script: "text/javascript, application/javascript",
+			json: "application/json, text/javascript",
+			text: "text/plain",
+			_default: "*/*"
+		}
 	},
 	
 	// Last-Modified header cache for next request
@@ -224,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;
@@ -275,6 +283,11 @@ jQuery.extend({
 
 			// Set header so the called script knows that it's an XMLHttpRequest
 			xml.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+
+			// 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 );
 		} catch(e){}
 
 		// Allow custom headers/mimetypes