diff options
| author | gnarf <gnarf@gnarf.net> | 2011-02-24 13:10:33 -0600 |
|---|---|---|
| committer | gnarf <gnarf@gnarf.net> | 2011-02-24 13:10:33 -0600 |
| commit | 14e9da51f96a7a9b1a5c239c32f4abe20eb2b795 (patch) | |
| tree | 11c3aa3f4e6c07481a494ca1fca090eca7598a03 | |
| parent | 58faec7cb7e820ef910b4850f5234da3989e6961 (diff) | |
| download | jquery-14e9da51f96a7a9b1a5c239c32f4abe20eb2b795.tar.gz jquery-14e9da51f96a7a9b1a5c239c32f4abe20eb2b795.zip | |
A quick change to detect AIR urls
| -rw-r--r-- | src/ajax.js | 2 | ||||
| -rw-r--r-- | test/unit/ajax.js | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/ajax.js b/src/ajax.js index 6414e8c29..4714afdae 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 335c2ac4d..4ce15f8f3 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 |