deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:jquery/jquery

Browse source
This commit is contained in:
jeresig 2010-09-24 17:05:28 -04:00
commit 700ff05af0
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ajax.js
View file

@ -302,10 +302,10 @@ jQuery.extend({
if ( s.dataType === "script" && type === "GET" && remote ) { if ( s.dataType === "script" && type === "GET" && remote ) {
var head = document.getElementsByTagName("head")[0] || document.documentElement; var head = document.getElementsByTagName("head")[0] || document.documentElement;
var script = document.createElement("script"); var script = document.createElement("script");
script.src = s.url;
if ( s.scriptCharset ) { if ( s.scriptCharset ) {
script.charset = s.scriptCharset; script.charset = s.scriptCharset;
} }
script.src = s.url;
// Handle Script loading // Handle Script loading
if ( !jsonp ) { if ( !jsonp ) {
@ -379,7 +379,7 @@ jQuery.extend({
// Set the Accepts header for the server, depending on the dataType // Set the Accepts header for the server, depending on the dataType
xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ? xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ?
s.accepts[ s.dataType ] + ", */*" : s.accepts[ s.dataType ] + ", */*; q=0.01" :
s.accepts._default ); s.accepts._default );
} catch( headerError ) {} } catch( headerError ) {}