From: JessThrysoee <jess@thrysoee.dk>
Date: Thu, 10 Mar 2011 23:17:38 +0000 (+0100)
Subject: Make it possible to force the Ajax crossDomain option to false.
X-Git-Tag: 1.5.2~5^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=515c56f9c6394a4ddadf29c55867f71dec6dcdb7;p=jquery.git

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

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 ] ||