Merge branch 'master' of github.com:jquery/jquery into csshooks

This commit is contained in:
jeresig 2010-09-08 13:47:56 -04:00
commit ca3b18ca53

View file

@ -278,7 +278,7 @@ test("pseudo - child", function() {
expect(31); expect(31);
t( "First Child", "p:first-child", ["firstp","sndp"] ); t( "First Child", "p:first-child", ["firstp","sndp"] );
t( "Last Child", "p:last-child", ["sap"] ); t( "Last Child", "p:last-child", ["sap"] );
t( "Only Child", "a:only-child", ["simon1","anchor1","yahoo","anchor2","liveLink1","liveLink2"] ); t( "Only Child", "#main a:only-child", ["simon1","anchor1","yahoo","anchor2","liveLink1","liveLink2"] );
t( "Empty", "ul:empty", ["firstUL"] ); t( "Empty", "ul:empty", ["firstUL"] );
t( "Is A Parent", "p:parent", ["firstp","ap","sndp","en","sap","first"] ); t( "Is A Parent", "p:parent", ["firstp","ap","sndp","en","sap","first"] );
@ -295,7 +295,7 @@ test("pseudo - child", function() {
QUnit.reset(); QUnit.reset();
t( "Last Child", "p:last-child", ["sap"] ); t( "Last Child", "p:last-child", ["sap"] );
t( "Last Child", "a:last-child", ["simon1","anchor1","mark","yahoo","anchor2","simon","liveLink1","liveLink2"] ); t( "Last Child", "#main a:last-child", ["simon1","anchor1","mark","yahoo","anchor2","simon","liveLink1","liveLink2"] );
t( "Nth-child", "#main form#form > *:nth-child(2)", ["text1"] ); t( "Nth-child", "#main form#form > *:nth-child(2)", ["text1"] );
t( "Nth-child", "#main form#form > :nth-child(2)", ["text1"] ); t( "Nth-child", "#main form#form > :nth-child(2)", ["text1"] );