Fix #12009. $().find( DOMElement ) should pushStack properly. Close gh-927.

1 files changed, 24 insertions, 17 deletions

diff --git a/src/traversing.js b/src/traversing.js
index 1f38d68cd..0d76038ca 100644
--- a/src/traversing.js
+++ b/src/traversing.js
@@ -12,39 +12,46 @@ var runtil = /Until$/,
 
 jQuery.fn.extend({
 	find: function( selector ) {
-		var i, l, length, n, r, ret,
-			self = this;
+		var prevLength, n, r, ret,
+			i = 0,
+			self = this,
+			selfLength = this.length;
 
 		if ( typeof selector !== "string" ) {
-			return jQuery( selector ).filter(function() {
-				for ( i = 0, l = self.length; i < l; i++ ) {
+
+			ret = jQuery( selector ).filter(function() {
+				for ( ; i < selfLength; i++ ) {
 					if ( jQuery.contains( self[ i ], this ) ) {
 						return true;
 					}
 				}
 			});
-		}
 
-		ret = this.pushStack( [] );
-
-		for ( i = 0, l = this.length; i < l; i++ ) {
-			length = ret.length;
-			jQuery.find( selector, this[i], ret );
+		} else {
 
-			if ( i > 0 ) {
-				// Make sure that the results are unique
-				for ( n = length; n < ret.length; n++ ) {
-					for ( r = 0; r < length; r++ ) {
-						if ( ret[r] === ret[n] ) {
-							ret.splice(n--, 1);
+			ret = [];
+			for ( ; i < selfLength; i++ ) {
+				prevLength = ret.length;
+				jQuery.find( selector, this[ i ], ret );
+
+				if ( i > 0 ) {
+					// Make sure that the results are unique
+					// by comparing the newly added elements on the ith
+					// iteration to the elements added by the previous iterations
+					for ( n = prevLength; n < ret.length; n++ ) {
+						for ( r = 0; r < prevLength; r++ ) {
+							if ( ret[ r ] === ret[ n ] ) {
+								ret.splice( n--, 1 );
 							break;
+							}
 						}
 					}
 				}
 			}
 		}
 
-		// Needed because $( "selector", context ) becomes $( context ).find( "selector" )
+		// Needed because $( selector, context ) becomes $( context ).find( selector )
+		ret = this.pushStack( ret );
 		ret.selector = ( this.selector ? this.selector + " " : "" ) + selector;
 		return ret;
 	},