Commit 6c2b64df authored by Richard Gibson's avatar Richard Gibson Committed by Dave Methvin

Fix #10967: jQuery.fn.promise returns provided object

parent a8dd4554
...@@ -174,7 +174,7 @@ jQuery.fn.extend({ ...@@ -174,7 +174,7 @@ jQuery.fn.extend({
} }
} }
resolve(); resolve();
return defer.promise(); return defer.promise( object );
} }
}); });
......
...@@ -293,3 +293,13 @@ test("promise()", function() { ...@@ -293,3 +293,13 @@ test("promise()", function() {
this.dequeue(); this.dequeue();
}); });
}); });
test(".promise(obj)", function() {
expect(2);
var obj = {};
var promise = jQuery( "#foo" ).promise( "promise", obj );
ok( jQuery.isFunction( promise.promise ), ".promise(type, obj) returns a promise" );
strictEqual( promise, obj, ".promise(type, obj) returns obj" );
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment