Skip to content
Permalink
Browse files

Coerce s.url to string before calling replace, since replace is also …

…a method of a Location object. Fixes #7531.
  • Loading branch information...
csnover committed Nov 17, 2010
1 parent 0838bdf commit 2a0c7d702b83a6b2e40eb79a5d6ea94d74f3090d
Showing with 14 additions and 1 deletion.
  1. +4 −1 src/ajax.js
  2. +10 −0 test/unit/ajax.js
@@ -198,7 +198,10 @@ jQuery.extend({
var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings),
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.toString().replace( rhash, "" );

// Use original (not extended) context object if it was provided
s.context = origSettings && origSettings.context != null ? origSettings.context : s;
@@ -1350,6 +1350,16 @@ test("jQuery.ajax - active counter", function() {
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" );
});

}

0 comments on commit 2a0c7d7

Please sign in to comment.
You can’t perform that action at this time.