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

Fix for #8421. Makes sure resolveWith can be called with only one parameter.

Browse source
This commit is contained in:
jaubourg 2011-03-03 15:16:47 +01:00
parent 71bd828d9f
commit c1279895f3
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core.js
View file

@ -837,6 +837,8 @@ jQuery.extend({
// resolve with given context and args // resolve with given context and args
resolveWith: function( context, args ) { resolveWith: function( context, args ) {
if ( !cancelled && !fired && !firing ) { if ( !cancelled && !fired && !firing ) {
// make sure args are available (#8421)
args = args || [];
firing = 1; firing = 1;
try { try {
while( callbacks[ 0 ] ) { while( callbacks[ 0 ] ) {

8
test/unit/core.js
View file

@ -916,7 +916,7 @@ test("jQuery.parseJSON", function(){
test("jQuery._Deferred()", function() { test("jQuery._Deferred()", function() {
expect( 10 ); expect( 11 );
var deferred, var deferred,
object, object,
@ -1005,6 +1005,12 @@ test("jQuery._Deferred()", function() {
deferred.resolveWith( jQuery , [ document ] ).done( function( doc ) { deferred.resolveWith( jQuery , [ document ] ).done( function( doc ) {
ok( this === jQuery && arguments.length === 1 && doc === document , "Test fire context & args" ); ok( this === jQuery && arguments.length === 1 && doc === document , "Test fire context & args" );
}); });
// #8421
deferred = jQuery._Deferred();
deferred.resolveWith().done(function() {
ok( true, "Test resolveWith can be called with no argument" );
});
}); });
test("jQuery.Deferred()", function() { test("jQuery.Deferred()", function() {