deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'bug7531' of https://github.com/csnover/jquery into csnover-bug7531

Browse source
This commit is contained in:
John Resig 2010-12-06 17:22:02 -05:00
parent b00ab56160 c04500a834
commit 6c68124928
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ajax.js
View file

@ -198,7 +198,10 @@ jQuery.extend({
var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings), var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings),
jsonp, status, data, type = s.type.toUpperCase(), noContent = rnoContent.test(type); jsonp, status, data, type = s.type.toUpperCase(), noContent = rnoContent.test(type);
s.url = s.url.replace( rhash, "" ); // toString fixes people passing a window.location or
// document.location to $.ajax, which worked in 1.4.2 and
// earlier (bug #7531). It should be removed in 1.5.
s.url = ("" + s.url).replace( rhash, "" );
// Use original (not extended) context object if it was provided // Use original (not extended) context object if it was provided
s.context = origSettings && origSettings.context != null ? origSettings.context : s; s.context = origSettings && origSettings.context != null ? origSettings.context : s;

10
test/unit/ajax.js
View file

@ -1361,6 +1361,16 @@ test("jQuery.ajax - active counter", function() {
ok( jQuery.active == 0, "ajax active counter should be zero: " + jQuery.active ); ok( jQuery.active == 0, "ajax active counter should be zero: " + jQuery.active );
}); });
test( "jQuery.ajax - Location object as url (#7531)", 1, function () {
var success = false;
try {
var xhr = jQuery.ajax({ url: document.location });
success = true;
xhr.abort();
} catch (e) {}
ok( success, "document.location did not generate exception" );
});
} }