Skip to content

Commit 65bdfbf

Browse files
markelogmarkelog
committed
Reduce traversing module
1 parent c928ed4 commit 65bdfbf

File tree

2 files changed

+81
-73
lines changed

2 files changed

+81
-73
lines changed

‎src/traversing.js

Lines changed: 74 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,38 @@ var runtil = /Until$/,
1212

1313
jQuery.fn.extend({
1414
find: function( selector ) {
15-
var i, ret, self;
15+
var self, matched, i,
16+
l = this.length;
1617

1718
if ( typeof selector !== "string" ) {
1819
self = this;
1920
return this.pushStack( jQuery( selector ).filter(function() {
20-
for ( i = 0; i < self.length; i++ ) {
21+
for ( i = 0; i < l; i++ ) {
2122
if ( jQuery.contains( self[ i ], this ) ) {
2223
return true;
2324
}
2425
}
2526
}) );
2627
}
2728

28-
ret = [];
29-
for ( i = 0; i < this.length; i++ ) {
30-
jQuery.find( selector, this[ i ], ret );
29+
matched = [];
30+
for ( i = 0; i < l; i++ ) {
31+
jQuery.find( selector, this[ i ], matched );
3132
}
3233

3334
// Needed because $( selector, context ) becomes $( context ).find( selector )
34-
ret = this.pushStack( jQuery.unique( ret ) );
35-
ret.selector = ( this.selector ? this.selector + " " : "" ) + selector;
36-
return ret;
35+
matched = this.pushStack( jQuery.unique( matched ) );
36+
matched.selector = ( this.selector ? this.selector + " " : "" ) + selector;
37+
return matched;
3738
},
3839

3940
has: function( target ) {
40-
var i,
41-
targets = jQuery( target, this ),
42-
len = targets.length;
41+
var targets = jQuery( target, this ),
42+
l = targets.length;
4343

4444
return this.filter(function() {
45-
for ( i = 0; i < len; i++ ) {
45+
var i = 0;
46+
for ( ; i < l; i++ ) {
4647
if ( jQuery.contains( this, targets[i] ) ) {
4748
return true;
4849
}
@@ -64,33 +65,32 @@ jQuery.fn.extend({
6465
// If this is a positional/relative selector, check membership in the returned set
6566
// so $("p:first").is("p:last") won't return true for a doc with two "p".
6667
rneedsContext.test( selector ) ?
67-
jQuery( selector, this.context ).index( this[0] ) >= 0 :
68+
jQuery( selector, this.context ).index( this[ 0 ] ) >= 0 :
6869
jQuery.filter( selector, this ).length > 0 :
6970
this.filter( selector ).length > 0 );
7071
},
7172

7273
closest: function( selectors, context ) {
73-
var cur,
74-
i = 0,
74+
var cur, i = 0,
7575
l = this.length,
76-
ret = [],
77-
pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
76+
matched = [],
77+
pos = ( rneedsContext.test( selectors ) || typeof selectors !== "string" ) ?
7878
jQuery( selectors, context || this.context ) :
7979
0;
8080

8181
for ( ; i < l; i++ ) {
82-
cur = this[i];
82+
cur = this[ i ];
8383

84-
while ( cur && cur.ownerDocument && cur !== context && cur.nodeType !== 11 ) {
85-
if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
86-
ret.push( cur );
84+
while ( cur && cur.ownerDocument && cur !== context ) {
85+
if ( pos ? pos.index( cur ) > -1 : jQuery.find.matchesSelector( cur, selectors ) ) {
86+
matched.push( cur );
8787
break;
8888
}
89-
cur = cur.parentNode;
89+
cur = cur.parentElement;
9090
}
9191
}
9292

93-
return this.pushStack( ret.length > 1 ? jQuery.unique( ret ) : ret );
93+
return this.pushStack( matched.length > 1 ? jQuery.unique( matched ) : matched );
9494
},
9595

9696
// Determine the position of an element within
@@ -99,18 +99,20 @@ jQuery.fn.extend({
9999

100100
// No argument, return index in parent
101101
if ( !elem ) {
102-
return ( this[0] && this[0].parentNode ) ? this.first().prevAll().length : -1;
102+
return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1;
103103
}
104104

105105
// index in selector
106106
if ( typeof elem === "string" ) {
107-
return jQuery.inArray( this[0], jQuery( elem ) );
107+
return core_indexOf.call( jQuery( elem ), this[ 0 ] );
108108
}
109109

110110
// Locate the position of the desired element
111-
return jQuery.inArray(
111+
return core_indexOf.call( this,
112+
112113
// If it receives a jQuery object, the first element is used
113-
elem.jquery ? elem[0] : elem, this );
114+
elem.jquery ? elem[ 0 ] : elem
115+
);
114116
},
115117

116118
add: function( selector, context ) {
@@ -131,48 +133,42 @@ jQuery.fn.extend({
131133

132134
jQuery.fn.andSelf = jQuery.fn.addBack;
133135

134-
function sibling( cur, dir ) {
135-
do {
136-
cur = cur[ dir ];
137-
} while ( cur && cur.nodeType !== 1 );
138-
139-
return cur;
140-
}
141-
142136
jQuery.each({
143137
parent: function( elem ) {
144-
var parent = elem.parentNode;
145-
return parent && parent.nodeType !== 11 ? parent : null;
138+
return elem.parentElement;
146139
},
147140
parents: function( elem ) {
148-
return jQuery.dir( elem, "parentNode" );
141+
return jQuery.dir( elem, "parentElement" );
149142
},
150143
parentsUntil: function( elem, i, until ) {
151-
return jQuery.dir( elem, "parentNode", until );
144+
return jQuery.dir( elem, "parentElement", until );
152145
},
153146
next: function( elem ) {
154-
return sibling( elem, "nextSibling" );
147+
return elem.nextElementSibling;
155148
},
156149
prev: function( elem ) {
157-
return sibling( elem, "previousSibling" );
150+
return elem.previousElementSibling;
158151
},
159152
nextAll: function( elem ) {
160-
return jQuery.dir( elem, "nextSibling" );
153+
return jQuery.dir( elem, "nextElementSibling" );
161154
},
162155
prevAll: function( elem ) {
163-
return jQuery.dir( elem, "previousSibling" );
156+
return jQuery.dir( elem, "previousElementSibling" );
164157
},
165158
nextUntil: function( elem, i, until ) {
166-
return jQuery.dir( elem, "nextSibling", until );
159+
return jQuery.dir( elem, "nextElementSibling", until );
167160
},
168161
prevUntil: function( elem, i, until ) {
169-
return jQuery.dir( elem, "previousSibling", until );
162+
return jQuery.dir( elem, "previousElementSibling", until );
170163
},
171164
siblings: function( elem ) {
172165
return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
173166
},
174167
children: function( elem ) {
175-
return jQuery.sibling( elem.firstChild );
168+
var children = elem.children;
169+
170+
// documentFragment or document does not have children property
171+
return children ? jQuery.merge( [], children ) : jQuery.sibling( elem.firstChild );
176172
},
177173
contents: function( elem ) {
178174
return jQuery.nodeName( elem, "iframe" ) ?
@@ -181,23 +177,27 @@ jQuery.each({
181177
}
182178
}, function( name, fn ) {
183179
jQuery.fn[ name ] = function( until, selector ) {
184-
var ret = jQuery.map( this, fn, until );
180+
var matched = jQuery.map( this, fn, until );
185181

186182
if ( !runtil.test( name ) ) {
187183
selector = until;
188184
}
189185

190186
if ( selector && typeof selector === "string" ) {
191-
ret = jQuery.filter( selector, ret );
187+
matched = jQuery.filter( selector, matched );
192188
}
193189

194-
ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret;
190+
if ( this.length > 1 ) {
191+
if ( !guaranteedUnique[ name ] ) {
192+
jQuery.unique( matched );
193+
}
195194

196-
if ( this.length > 1 && rparentsprev.test( name ) ) {
197-
ret = ret.reverse();
195+
if ( rparentsprev.test( name ) ) {
196+
matched.reverse();
197+
}
198198
}
199199

200-
return this.pushStack( ret );
200+
return this.pushStack( matched );
201201
};
202202
});
203203

@@ -208,33 +208,32 @@ jQuery.extend({
208208
}
209209

210210
return elems.length === 1 ?
211-
jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
212-
jQuery.find.matches(expr, elems);
211+
jQuery.find.matchesSelector( elems[ 0 ], expr ) ? [ elems[ 0 ] ] : [] :
212+
jQuery.find.matches( expr, elems );
213213
},
214214

215215
dir: function( elem, dir, until ) {
216-
var matched = [],
217-
cur = elem[ dir ];
216+
var cur = elem[ dir ],
217+
matched = [];
218218

219-
while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
220-
if ( cur.nodeType === 1 ) {
221-
matched.push( cur );
222-
}
223-
cur = cur[dir];
219+
while ( cur && ( !until || !jQuery( cur ).is( until ) ) ) {
220+
matched.push( cur );
221+
cur = cur[ dir ];
224222
}
223+
225224
return matched;
226225
},
227226

228227
sibling: function( n, elem ) {
229-
var r = [];
228+
var matched = [];
230229

231230
for ( ; n; n = n.nextSibling ) {
232231
if ( n.nodeType === 1 && n !== elem ) {
233-
r.push( n );
232+
matched.push( n );
234233
}
235234
}
236235

237-
return r;
236+
return matched;
238237
}
239238
});
240239

@@ -245,30 +244,34 @@ function winnow( elements, qualifier, keep ) {
245244
// Set to 0 to skip string check
246245
qualifier = qualifier || 0;
247246

247+
var filtered;
248+
248249
if ( jQuery.isFunction( qualifier ) ) {
249250
return jQuery.grep(elements, function( elem, i ) {
250251
var retVal = !!qualifier.call( elem, i, elem );
251252
return retVal === keep;
252253
});
254+
}
253255

254-
} else if ( qualifier.nodeType ) {
256+
if ( qualifier.nodeType ) {
255257
return jQuery.grep(elements, function( elem ) {
256258
return ( elem === qualifier ) === keep;
257259
});
260+
}
258261

259-
} else if ( typeof qualifier === "string" ) {
260-
var filtered = jQuery.grep(elements, function( elem ) {
262+
if ( typeof qualifier === "string" ) {
263+
filtered = jQuery.grep(elements, function( elem ) {
261264
return elem.nodeType === 1;
262265
});
263266

264267
if ( isSimple.test( qualifier ) ) {
265-
return jQuery.filter(qualifier, filtered, !keep);
266-
} else {
267-
qualifier = jQuery.filter( qualifier, filtered );
268+
return jQuery.filter( qualifier, filtered, !keep );
268269
}
270+
271+
qualifier = jQuery.filter( qualifier, filtered );
269272
}
270273

271274
return jQuery.grep(elements, function( elem ) {
272-
return ( jQuery.inArray( elem, qualifier ) >= 0 ) === keep;
275+
return ( core_indexOf.call( qualifier, elem ) >= 0 ) === keep;
273276
});
274277
}

‎test/unit/traversing.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -658,10 +658,15 @@ test("eq('-1') #10616", function() {
658658
});
659659

660660
test("index(no arg) #10977", function() {
661-
expect(1);
662-
661+
expect(2);
662+
663663
var $list = jQuery("<ul id='indextest'><li>THIS ONE</li><li class='one'>a</li><li class='two'>b</li><li class='three'>c</li></ul>");
664664
jQuery("#qunit-fixture").append( $list );
665665
strictEqual ( jQuery( "#indextest li:not(.one,.two)" ).index() , 0, "No Argument Index Check" );
666666
$list.remove();
667+
668+
var fragment = document.createDocumentFragment(),
669+
div = fragment.appendChild( document.createElement("div") );
670+
671+
equal( jQuery( div ).index(), 0, "If jQuery#index called on element whos parent is fragment, it still should work correctly" );
667672
});

0 commit comments

Comments
 (0)