diff options
| author | JessThrysoee <jess@thrysoee.dk> | 2011-03-11 00:17:38 +0100 |
|---|---|---|
| committer | JessThrysoee <jess@thrysoee.dk> | 2011-03-11 00:17:38 +0100 |
| commit | 515c56f9c6394a4ddadf29c55867f71dec6dcdb7 (patch) | |
| tree | 52ffa66b50ddec1ac2ec7d40bcd2793376af560c /src | |
| parent | 6c124d3dd47fb399c7512c5c3b3420e438c32b65 (diff) | |
| download | jquery-515c56f9c6394a4ddadf29c55867f71dec6dcdb7.tar.gz jquery-515c56f9c6394a4ddadf29c55867f71dec6dcdb7.zip | |
Make it possible to force the Ajax crossDomain option to false.
Diffstat (limited to 'src')
| -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 4714afdae..66b26cd70 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -310,6 +310,7 @@ jQuery.extend({ contentType: "application/x-www-form-urlencoded", processData: true, async: true, + crossDomain: null, /* timeout: 0, data: null, @@ -319,7 +320,6 @@ jQuery.extend({ cache: null, traditional: false, headers: {}, - crossDomain: null, */ accepts: { @@ -604,7 +604,7 @@ jQuery.extend({ s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( rspacesAjax ); // Determine if a cross-domain request is in order - if ( !s.crossDomain ) { + if ( s.crossDomain == null ) { parts = rurl.exec( s.url.toLowerCase() ); s.crossDomain = !!( parts && ( parts[ 1 ] != ajaxLocParts[ 1 ] || parts[ 2 ] != ajaxLocParts[ 2 ] || |