Skip to content
Permalink
Browse files

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

  • Loading branch information
jeresig committed Sep 24, 2010
2 parents 395a032 + c8c8f84 commit 700ff05af0d30722dcc23a69849bfb278fdc7e75
Showing with 2 additions and 2 deletions.
  1. +2 −2 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 ) {}

0 comments on commit 700ff05

Please sign in to comment.
You can’t perform that action at this time.