From: jeresig Date: Fri, 24 Sep 2010 21:05:28 +0000 (-0400) Subject: Merge branch 'master' of github.com:jquery/jquery X-Git-Url: http://git.asbjorn.biz/?a=commitdiff_plain;h=700ff05af0d30722dcc23a69849bfb278fdc7e75;hp=395a032ad8263f2674fc95b779a7e9623c6317b9;p=jquery.git Merge branch 'master' of github.com:jquery/jquery --- diff --git a/src/ajax.js b/src/ajax.js index 5d93af6..71bdd46 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -302,10 +302,10 @@ jQuery.extend({ if ( s.dataType === "script" && type === "GET" && remote ) { var head = document.getElementsByTagName("head")[0] || document.documentElement; var script = document.createElement("script"); - script.src = s.url; if ( s.scriptCharset ) { script.charset = s.scriptCharset; } + script.src = s.url; // Handle Script loading if ( !jsonp ) { @@ -379,7 +379,7 @@ jQuery.extend({ // Set the Accepts header for the server, depending on the dataType xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ? - s.accepts[ s.dataType ] + ", */*" : + s.accepts[ s.dataType ] + ", */*; q=0.01" : s.accepts._default ); } catch( headerError ) {}