Skip to content
Permalink
Browse files

2773: first pass adding node/jQuery object support to jQuery.fn.find;…

… unit tests added
  • Loading branch information...
timmywil
timmywil committed Mar 16, 2011
1 parent 8246347 commit 7a69e34a5cd4df37762cbee9c9468c96c0ac3017
Showing with 39 additions and 11 deletions.
  1. +1 −1 src/core.js
  2. +18 −5 src/traversing.js
  3. +20 −5 test/unit/traversing.js
@@ -88,7 +88,7 @@ jQuery.fn = jQuery.prototype = {
if ( selector === "body" && !context && document.body ) {
this.context = document;
this[0] = document.body;
this.selector = "body";
this.selector = selector;
this.length = 1;
return this;
}
@@ -17,17 +17,30 @@ var runtil = /Until$/,

jQuery.fn.extend({
find: function( selector ) {
var ret = this.pushStack( "", "find", selector ),
length = 0;
var self = this,
ret, i, l;

if ( typeof selector !== "string" ) {
return jQuery( selector ).filter(function() {
for ( i = 0, l = self.length; i < l; i++ ) {
if ( jQuery.contains( self[ i ], this ) ) {
return true;
}
}
});
}

for ( var i = 0, l = this.length; i < l; i++ ) {
ret = this.pushStack( "", "find", selector );

var length, n, r;
for ( i = 0, l = this.length; i < l; i++ ) {
length = ret.length;
jQuery.find( selector, this[i], ret );

if ( i > 0 ) {
// Make sure that the results are unique
for ( var n = length; n < ret.length; n++ ) {
for ( var r = 0; r < length; r++ ) {
for ( n = length; n < ret.length; n++ ) {
for ( r = 0; r < length; r++ ) {
if ( ret[r] === ret[n] ) {
ret.splice(n--, 1);
break;
@@ -14,12 +14,27 @@ test("find(String)", function() {
});

test("find(node|jQuery object)", function() {
expect( 2 );
expect( 11 );

var $foo = jQuery('#foo'),
$blog = jQuery('.blogTest'),
$first = jQuery('#first'),
$two = $blog.add( $first ),
$fooTwo = $foo.add( $blog );

equals( $foo.find( $blog ).text(), 'Yahoo', 'Find with blog jQuery object' );
equals( $foo.find( $blog[0] ).text(), 'Yahoo', 'Find with blog node' );
equals( $foo.find( $first ).length, 0, '#first is not in #foo' );
equals( $foo.find( $first[0]).length, 0, '#first not in #foo (node)' );
ok( $foo.find( $two ).is('.blogTest'), 'Find returns only nodes within #foo' );
ok( $fooTwo.find( $blog ).is('.blogTest'), 'Blog is part of the collection, but also within foo' );
ok( $fooTwo.find( $blog[0] ).is('.blogTest'), 'Blog is part of the collection, but also within foo(node)' );

equals( $two.find( $foo ).length, 0, 'Foo is not in two elements' );
equals( $two.find( $foo[0] ).length, 0, 'Foo is not in two elements(node)' );
equals( $two.find( $first ).length, 0, 'first is in the collection and not within two' );
equals( $two.find( $first ).length, 0, 'first is in the collection and not within two(node)' );

var $blog = jQuery('.blogTest'),
blog = $blog[0];
equals( jQuery('#foo').find( $blog ).text(), 'Yahoo', 'Find with blog jQuery object' );
equals( jQuery('#foo').find( blog ).text(), 'Yahoo', 'Find with blog node' );
});

test("is(String)", function() {

0 comments on commit 7a69e34

Please sign in to comment.
You can’t perform that action at this time.