Skip to content
Permalink
Browse files

fixed jQuery.dir regression introduced with 1.4 *untils patch that er…

…rored when traversing XHTML text nodes with an until test
  • Loading branch information
cowboy authored and jeresig committed Jan 21, 2010
1 parent 09ef5b7 commit 28ce15979f69903f2fe1187705b190968757ddf7
Showing with 4 additions and 2 deletions.
  1. +1 −1 src/traversing.js
  2. +3 −1 test/unit/traversing.js
@@ -235,7 +235,7 @@ jQuery.extend({

dir: function( elem, dir, until ) {
var matched = [], cur = elem[dir];
while ( cur && cur.nodeType !== 9 && (until === undefined || !jQuery( cur ).is( until )) ) {
while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
if ( cur.nodeType === 1 ) {
matched.push( cur );
}
@@ -317,7 +317,7 @@ test("prevAll([String])", function() {
});

test("nextUntil([String])", function() {
expect(10);
expect(11);

var elems = jQuery('#form').children().slice( 2, 12 );

@@ -331,6 +331,8 @@ test("nextUntil([String])", function() {
same( jQuery("#text1").nextUntil("#area1", "button,input").get(), elems.get(), "Multiple-filtered nextUntil check" );
equals( jQuery("#text1").nextUntil("#area1", "div").length, 0, "Filtered nextUntil check, no match" );
same( jQuery("#text1, #hidden1").nextUntil("#area1", "button,input").get(), elems.get(), "Multi-source, multiple-filtered nextUntil check" );

same( jQuery("#text1").nextUntil("[class=foo]").get(), jQuery("#text1").nextAll().get(), "Non-element nodes must be skipped, since they have no attributes" );
});

test("prevUntil([String])", function() {

0 comments on commit 28ce159

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