From: gnarf Date: Thu, 24 Feb 2011 19:10:33 +0000 (-0600) Subject: A quick change to detect AIR urls X-Git-Url: http://git.asbjorn.biz/?a=commitdiff_plain;ds=sidebyside;h=14e9da51f96a7a9b1a5c239c32f4abe20eb2b795;p=jquery.git A quick change to detect AIR urls --- diff --git a/src/ajax.js b/src/ajax.js index 6414e8c..4714afd 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -19,7 +19,7 @@ var r20 = /%20/g, rucHeadersFunc = function( _, $1, $2 ) { return $1 + $2.toUpperCase(); }, - rurl = /^([\w\+\.\-]+:)\/\/([^\/?#:]*)(?::(\d+))?/, + rurl = /^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?|\/[^\/])/, // Keep a copy of the old load method _load = jQuery.fn.load, diff --git a/test/unit/ajax.js b/test/unit/ajax.js index 335c2ac..4ce15f8 100644 --- a/test/unit/ajax.js +++ b/test/unit/ajax.js @@ -2239,6 +2239,18 @@ test("jQuery.ajax - active counter", function() { ok( jQuery.active == 0, "ajax active counter should be zero: " + jQuery.active ); }); +test("jQuery.ajax - compatible with AIR urls"), function() { + expect( 1 ); + stop(); + $.ajax({ + url: "app:/testing", + beforeSend: function() { + ok( this.crossDomain, "Detected crossDomain for AIR Url" ); + return false; + } + }); +}); + } //} \ No newline at end of file