From: Ariel Flesler Date: Tue, 13 May 2008 19:47:39 +0000 (+0000) Subject: jquery ajax: absolute urls were assumed to be cross domain. Closes #2816. X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;h=5c0aea3bfe58142c0f92fc3a059588455376ec29;p=jquery.git jquery ajax: absolute urls were assumed to be cross domain. Closes #2816. --- diff --git a/src/ajax.js b/src/ajax.js index 244397f..598232f 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -235,7 +235,8 @@ jQuery.extend({ // If we're requesting a remote document // and trying to load JSON or Script with a GET - if ( (!s.url.indexOf("http") || !s.url.indexOf("//")) && s.dataType == "script" && s.type.toLowerCase() == "get" ) { + if ( s.dataType == "script" && s.type.toLowerCase() == "get" + && jQuery.ajax.re.test(s.url) && jQuery.ajax.re.exec(s.url)[1] != location.host ){ var head = document.getElementsByTagName("head")[0]; var script = document.createElement("script"); script.src = s.url; @@ -499,3 +500,6 @@ jQuery.extend({ } }); + +// Matches an absolute URL, and saves the domain +jQuery.ajax.re = /^(?:\w+:)?\/\/([^\/?#]+)/;