diff options
| author | jeresig <jeresig@gmail.com> | 2010-09-24 17:05:28 -0400 |
|---|---|---|
| committer | jeresig <jeresig@gmail.com> | 2010-09-24 17:05:28 -0400 |
| commit | 700ff05af0d30722dcc23a69849bfb278fdc7e75 (patch) | |
| tree | 529d29b8a49bdc0e79c25d9a190771bcc4e3d7f5 /src/ajax.js | |
| parent | 395a032ad8263f2674fc95b779a7e9623c6317b9 (diff) | |
| parent | c8c8f8458a579d8f87e7ee6b8e4510cc4e4445bb (diff) | |
| download | jquery-700ff05af0d30722dcc23a69849bfb278fdc7e75.tar.gz jquery-700ff05af0d30722dcc23a69849bfb278fdc7e75.zip | |
Merge branch 'master' of github.com:jquery/jquery
Diffstat (limited to 'src/ajax.js')
| -rw-r--r-- | src/ajax.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ajax.js b/src/ajax.js index 5d93af664..71bdd461b 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 ) {} |