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

Make it possible to force the Ajax crossDomain option to false.

Browse source
This commit is contained in:
JessThrysoee 2011-03-11 00:17:38 +01:00
parent 6c124d3dd4
commit 515c56f9c6
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

@ -310,6 +310,7 @@ jQuery.extend({
contentType: "application/x-www-form-urlencoded", contentType: "application/x-www-form-urlencoded",
processData: true, processData: true,
async: true, async: true,
crossDomain: null,
/* /*
timeout: 0, timeout: 0,
data: null, data: null,
@ -319,7 +320,6 @@ jQuery.extend({
cache: null, cache: null,
traditional: false, traditional: false,
headers: {}, headers: {},
crossDomain: null,
*/ */
accepts: { accepts: {
@ -604,7 +604,7 @@ jQuery.extend({
s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( rspacesAjax ); s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( rspacesAjax );
// Determine if a cross-domain request is in order // Determine if a cross-domain request is in order
if ( !s.crossDomain ) { if ( s.crossDomain == null ) {
parts = rurl.exec( s.url.toLowerCase() ); parts = rurl.exec( s.url.toLowerCase() );
s.crossDomain = !!( parts && s.crossDomain = !!( parts &&
( parts[ 1 ] != ajaxLocParts[ 1 ] || parts[ 2 ] != ajaxLocParts[ 2 ] || ( parts[ 1 ] != ajaxLocParts[ 1 ] || parts[ 2 ] != ajaxLocParts[ 2 ] ||