Fail silently if closest is somehow called on a document. Fixes #10726.

timmywil · timmywil · commit 17a26f5bd9b1 · 2012-07-25T16:05:59.000-04:00
diff --git a/src/traversing.js b/src/traversing.js
@@ -92,16 +92,13 @@ jQuery.fn.extend({
 		for ( ; i < l; i++ ) {
 			cur = this[i];
 
-			while ( cur ) {
+			while ( cur && cur.ownerDocument && cur !== context && cur.nodeType !== 11 ) {
 				if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
 					ret.push( cur );
 					break;
 
 				} else {
 					cur = cur.parentNode;
-					if ( !cur || !cur.ownerDocument || cur === context || cur.nodeType === 11 ) {
-						break;
-					}
 				}
 			}
 		}
diff --git a/test/unit/traversing.js b/test/unit/traversing.js
@@ -275,7 +275,8 @@ test("filter() with positional selectors", function() {
 });
 
 test("closest()", function() {
-	expect(13);
+	expect( 14 );
+
 	deepEqual( jQuery("body").closest("body").get(), q("body"), "closest(body)" );
 	deepEqual( jQuery("body").closest("html").get(), q("html"), "closest(html)" );
 	deepEqual( jQuery("body").closest("div").get(), [], "closest(div)" );
@@ -299,6 +300,8 @@ test("closest()", function() {
 	// Bug #7369
 	equal( jQuery("<div foo='bar'></div>").closest("[foo]").length, 1, "Disconnected nodes with attribute selector" );
 	equal( jQuery("<div>text</div>").closest("[lang]").length, 0, "Disconnected nodes with text and non-existent attribute selector" );
+
+	ok( !jQuery(document).closest("#foo").length, "Calling closest on a document fails silently" );
 });
 
 test("closest(jQuery)", function() {

Original file line number	Diff line number	Diff line change
`@@ -92,16 +92,13 @@ jQuery.fn.extend({`
`92`	`92`	`for ( ; i < l; i++ ) {`
`93`	`93`	`cur = this[i];`
`94`	`94`
`95`		`- while ( cur ) {`
	`95`	`+ while ( cur && cur.ownerDocument && cur !== context && cur.nodeType !== 11 ) {`
`96`	`96`	`if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {`
`97`	`97`	`ret.push( cur );`
`98`	`98`	`break;`
`99`	`99`
`100`	`100`	`} else {`
`101`	`101`	`cur = cur.parentNode;`
`102`		`- if ( !cur \|\| !cur.ownerDocument \|\| cur === context \|\| cur.nodeType === 11 ) {`
`103`		`- break;`
`104`		`- }`
`105`	`102`	`}`
`106`	`103`	`}`
`107`	`104`	`}`