aboutsummaryrefslogtreecommitdiffstats
path: root/src/ajax.js
diff options
context:
space:
mode:
authorDave Methvin <dave.methvin@gmail.com>2011-03-30 21:52:04 -0400
committerDave Methvin <dave.methvin@gmail.com>2011-03-30 21:52:04 -0400
commitadbe5e95f3411882d98c4c6e70cdc0a79dfc3d57 (patch)
tree1be1caf9bbcb115ca9a9cb9645e41b85f71bd66c /src/ajax.js
parentad4152709cd7c7b7fdafd2dc0b266fd273aff5d5 (diff)
parent11c26b3cc9bf84f93d34f45056d29a446baeb6c9 (diff)
downloadjquery-adbe5e95f3411882d98c4c6e70cdc0a79dfc3d57.tar.gz
jquery-adbe5e95f3411882d98c4c6e70cdc0a79dfc3d57.zip
Merge branch 'crossDomain' of https://github.com/JessThrysoee/jquery into JessThrysoee-crossDomain
Diffstat (limited to 'src/ajax.js')
-rw-r--r--src/ajax.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ajax.js b/src/ajax.js
index add3b3738..570285af5 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -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 ] ||