Added support for .closest(filter, DOMElement). Fixes #4072.

diff --git a/src/traversing.js b/src/traversing.js
index db446cf81756d149ccb5091c0424dfb6f7b9a1a1..f46820f849d913a3fe95942eb58c52d31d5d1ca8 100644 (file)
--- a/src/traversing.js
+++ b/src/traversing.js
@@ -51,13 +51,13 @@ jQuery.fn.extend({
                return this.pushStack( jQuery.winnow(this, selector, true), "filter", selector );
        },
 
-       closest: function( selector ) {
+       closest: function( selector, context ) {
                var pos = jQuery.expr.match.POS.test( selector ) ? jQuery(selector) : null,
                        closer = 0;
 
                return this.map(function(){
                        var cur = this;
-                       while ( cur && cur.ownerDocument ) {
+                       while ( cur && cur.ownerDocument && cur !== context ) {
                                if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selector) ) {
                                        jQuery.data(cur, "closest", closer);
                                        return cur;

diff --git a/test/unit/traversing.js b/test/unit/traversing.js
index f585d9ca4b82eeccf34dda3d926cfc28bc00878e..1a7e6ee8000b478db7e93c6441d88cbc2373d52b 100644 (file)
--- a/test/unit/traversing.js
+++ b/test/unit/traversing.js
@@ -91,7 +91,7 @@ test("filter(jQuery)", function() {
 })
 
 test("closest()", function() {
-       expect(6);
+       expect(9);
        isSet( jQuery("body").closest("body").get(), q("body"), "closest(body)" );
        isSet( jQuery("body").closest("html").get(), q("html"), "closest(html)" );
        isSet( jQuery("body").closest("div").get(), [], "closest(div)" );
@@ -99,6 +99,12 @@ test("closest()", function() {
 
        isSet( jQuery("div:eq(1)").closest("div:first").get(), [], "closest(div:first)" );
        isSet( jQuery("div").closest("body:first div:last").get(), q("fx-tests"), "closest(body:first div:last)" );
+
+       // Test .closest() limited by the context
+       var jq = jQuery("#nothiddendivchild");
+       isSet( jq.closest("html", document.body).get(), [], "Context limited." );
+       isSet( jq.closest("body", document.body).get(), [], "Context limited." );
+       isSet( jq.closest("#nothiddendiv", document.body).get(), q("nothiddendiv"), "Context not reached." );
 });
 
 test("not(Selector)", function() {