github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-02-03 04:55:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix #13265 #13332: traversing methods with text nodes. Close gh-1145.

Browse Source
This commit is contained in:
Richard Gibson
2013-01-27 13:24:50 -05:00
committed by Dave Methvin
parent 1d5d959ee0
commit b734666f4d
3 changed files with 68 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/traversing.js
View File

@@ -80,14 +80,18 @@ jQuery.fn.extend({
0;
for ( ; i < l; i++ ) {
cur = this[ i ];
for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) {
// Always skip document fragments
if ( cur.nodeType < 11 && (pos ?
pos.index(cur) > -1 :
while ( cur && cur.ownerDocument && cur !== context ) {
if ( pos ? pos.index( cur ) > -1 : jQuery.find.matchesSelector( cur, selectors ) ) {
matched.push( cur );
// Don't pass non-elements to Sizzle
cur.nodeType === 1 &&
jQuery.find.matchesSelector(cur, selectors)) ) {
cur = matched.push( cur );
break;
}
cur = cur.parentElement;
}
}
@@ -134,42 +138,46 @@ jQuery.fn.extend({
jQuery.fn.andSelf = jQuery.fn.addBack;
function sibling( cur, dir ) {
while ( (cur = cur[dir]) && cur.nodeType !== 1 ) {}
return cur;
}
jQuery.each({
parent: function( elem ) {
return elem.parentElement;
var parent = elem.parentNode;
return parent && parent.nodeType !== 11 ? parent : null;
},
parents: function( elem ) {
return jQuery.dir( elem, "parentElement" );
return jQuery.dir( elem, "parentNode" );
},
parentsUntil: function( elem, i, until ) {
return jQuery.dir( elem, "parentElement", until );
return jQuery.dir( elem, "parentNode", until );
},
next: function( elem ) {
return elem.nextElementSibling;
return sibling( elem, "nextSibling" );
},
prev: function( elem ) {
return elem.previousElementSibling;
return sibling( elem, "previousSibling" );
},
nextAll: function( elem ) {
return jQuery.dir( elem, "nextElementSibling" );
return jQuery.dir( elem, "nextSibling" );
},
prevAll: function( elem ) {
return jQuery.dir( elem, "previousElementSibling" );
return jQuery.dir( elem, "previousSibling" );
},
nextUntil: function( elem, i, until ) {
return jQuery.dir( elem, "nextElementSibling", until );
return jQuery.dir( elem, "nextSibling", until );
},
prevUntil: function( elem, i, until ) {
return jQuery.dir( elem, "previousElementSibling", until );
return jQuery.dir( elem, "previousSibling", until );
},
siblings: function( elem ) {
return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
},
children: function( elem ) {
var children = elem.children;
// documentFragment or document does not have children property
return children ? jQuery.merge( [], children ) : jQuery.sibling( elem.firstChild );
return jQuery.sibling( elem.firstChild );
},
contents: function( elem ) {
return jQuery.nodeName( elem, "iframe" ) ?
@@ -214,14 +222,17 @@ jQuery.extend({
},
dir: function( elem, dir, until ) {
var cur = elem[ dir ],
matched = [];
var matched = [],
truncate = until !== undefined;
while ( cur && ( !until || !jQuery( cur ).is( until ) ) ) {
matched.push( cur );
cur = cur[ dir ];
while ( (elem = elem[ dir ]) && elem.nodeType !== 9 ) {
if ( elem.nodeType === 1 ) {
if ( truncate && jQuery( elem ).is( until ) ) {
break;
}
matched.push( elem );
}
}
return matched;
},