deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed non-unique results from .parent(), .parents(), .next(), etc. (Bug #1449)

Browse source
This commit is contained in:
John Resig 2007-08-19 00:07:41 +00:00
parent 760a244dbd
commit 05d401dd84
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/test/index.html
View file

@ -19,7 +19,7 @@
<h2 id="userAgent"></h2> <h2 id="userAgent"></h2>
<!-- Test HTML --> <!-- Test HTML -->
<dl style="display:none;"> <dl id="dl" style="display:none;">
<div id="main" style="display: none;"> <div id="main" style="display: none;">
<p id="firstp">See <a id="simon1" href="http://simon.incutio.com/archive/2003/03/25/#getElementsBySelector" rel="bookmark">this blog entry</a> for more information.</p> <p id="firstp">See <a id="simon1" href="http://simon.incutio.com/archive/2003/03/25/#getElementsBySelector" rel="bookmark">this blog entry</a> for more information.</p>
<p id="ap"> <p id="ap">

19
src/jquery/coreTest.js vendored
View file

@ -722,11 +722,12 @@ test("not()", function() {
}); });
test("siblings([String])", function() { test("siblings([String])", function() {
expect(4); expect(5);
isSet( $("#en").siblings().get(), q("sndp", "sap"), "Check for siblings" ); isSet( $("#en").siblings().get(), q("sndp", "sap"), "Check for siblings" );
isSet( $("#sndp").siblings("[code]").get(), q("sap"), "Check for filtered siblings (has code child element)" ); isSet( $("#sndp").siblings("[code]").get(), q("sap"), "Check for filtered siblings (has code child element)" );
isSet( $("#sndp").siblings("[a]").get(), q("en", "sap"), "Check for filtered siblings (has anchor child element)" ); isSet( $("#sndp").siblings("[a]").get(), q("en", "sap"), "Check for filtered siblings (has anchor child element)" );
isSet( $("#foo").siblings("form, b").get(), q("form", "lengthtest", "floatTest"), "Check for multiple filters" ); isSet( $("#foo").siblings("form, b").get(), q("form", "lengthtest", "floatTest"), "Check for multiple filters" );
isSet( $("#en, #sndp").siblings().get(), q("sndp", "sap", "en"), "Check for unique results from siblings" );
}); });
test("children([String])", function() { test("children([String])", function() {
@ -736,26 +737,34 @@ test("children([String])", function() {
isSet( $("#foo").children("#en, #sap").get(), q("en", "sap"), "Check for multiple filters" ); isSet( $("#foo").children("#en, #sap").get(), q("en", "sap"), "Check for multiple filters" );
}); });
test("parent[s]([String])", function() { test("parent([String])", function() {
expect(8); expect(5);
ok( $("#groups").parent()[0].id == "ap", "Simple parent check" ); ok( $("#groups").parent()[0].id == "ap", "Simple parent check" );
ok( $("#groups").parent("p")[0].id == "ap", "Filtered parent check" ); ok( $("#groups").parent("p")[0].id == "ap", "Filtered parent check" );
ok( $("#groups").parent("div").length == 0, "Filtered parent check, no match" ); ok( $("#groups").parent("div").length == 0, "Filtered parent check, no match" );
ok( $("#groups").parent("div, p")[0].id == "ap", "Check for multiple filters" ); ok( $("#groups").parent("div, p")[0].id == "ap", "Check for multiple filters" );
isSet( $("#en, #sndp").parent().get(), q("foo"), "Check for unique results from parent" );
});
test("parents([String])", function() {
expect(5);
ok( $("#groups").parents()[0].id == "ap", "Simple parents check" ); ok( $("#groups").parents()[0].id == "ap", "Simple parents check" );
ok( $("#groups").parents("p")[0].id == "ap", "Filtered parents check" ); ok( $("#groups").parents("p")[0].id == "ap", "Filtered parents check" );
ok( $("#groups").parents("div")[0].id == "main", "Filtered parents check2" ); ok( $("#groups").parents("div")[0].id == "main", "Filtered parents check2" );
isSet( $("#groups").parents("p, div").get(), q("ap", "main"), "Check for multiple filters" ); isSet( $("#groups").parents("p, div").get(), q("ap", "main"), "Check for multiple filters" );
isSet( $("#en, #sndp").parents().get(), q("foo", "main", "dl", "body", "html"), "Check for unique results from parents" );
}); });
test("next/prev([String])", function() { test("next([String])", function() {
expect(8); expect(4);
ok( $("#ap").next()[0].id == "foo", "Simple next check" ); ok( $("#ap").next()[0].id == "foo", "Simple next check" );
ok( $("#ap").next("div")[0].id == "foo", "Filtered next check" ); ok( $("#ap").next("div")[0].id == "foo", "Filtered next check" );
ok( $("#ap").next("p").length == 0, "Filtered next check, no match" ); ok( $("#ap").next("p").length == 0, "Filtered next check, no match" );
ok( $("#ap").next("div, p")[0].id == "foo", "Multiple filters" ); ok( $("#ap").next("div, p")[0].id == "foo", "Multiple filters" );
});
test("prev([String])", function() {
expect(4);
ok( $("#foo").prev()[0].id == "ap", "Simple prev check" ); ok( $("#foo").prev()[0].id == "ap", "Simple prev check" );
ok( $("#foo").prev("p")[0].id == "ap", "Filtered prev check" ); ok( $("#foo").prev("p")[0].id == "ap", "Filtered prev check" );
ok( $("#foo").prev("div").length == 0, "Filtered prev check, no match" ); ok( $("#foo").prev("div").length == 0, "Filtered prev check, no match" );

2
src/jquery/jquery.js vendored
View file

@ -2073,7 +2073,7 @@ jQuery.each({
var ret = jQuery.map(this,n); var ret = jQuery.map(this,n);
if ( a && typeof a == "string" ) if ( a && typeof a == "string" )
ret = jQuery.multiFilter(a,ret); ret = jQuery.multiFilter(a,ret);
return this.pushStack( ret ); return this.pushStack( jQuery.unique(ret) );
}; };
}); });