Commit 5c0aea3b authored by Ariel Flesler's avatar Ariel Flesler

jquery ajax: absolute urls were assumed to be cross domain. Closes #2816.

parent bf802496
...@@ -235,7 +235,8 @@ jQuery.extend({ ...@@ -235,7 +235,8 @@ jQuery.extend({
// If we're requesting a remote document // If we're requesting a remote document
// and trying to load JSON or Script with a GET // 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 head = document.getElementsByTagName("head")[0];
var script = document.createElement("script"); var script = document.createElement("script");
script.src = s.url; script.src = s.url;
...@@ -499,3 +500,6 @@ jQuery.extend({ ...@@ -499,3 +500,6 @@ jQuery.extend({
} }
}); });
// Matches an absolute URL, and saves the domain
jQuery.ajax.re = /^(?:\w+:)?\/\/([^\/?#]+)/;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment