X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=3e72488036aa9bbdde8fa691466b31df06a91601;hb=4a11e6d70b5c4b1473b62050929cffe3d2a67317;hp=743857c1a07f6d9bcd313a77ca201b9c3ed6be9b;hpb=047debc750bd7ca15229297c1f3ab98527fe5be6;p=jquery.git diff --git a/src/ajax.js b/src/ajax.js index 743857c..3e72488 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,7 +287,7 @@ 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