Skip to content
Permalink
Browse files

Merge branch 'crossDomain' of https://github.com/JessThrysoee/jquery

…into JessThrysoee-crossDomain
  • Loading branch information...
dmethvin committed Mar 31, 2011
2 parents ad41527 + 11c26b3 commit adbe5e95f3411882d98c4c6e70cdc0a79dfc3d57
Showing with 1 addition and 1 deletion.
  1. +1 −1 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 ] ||

0 comments on commit adbe5e9

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