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

Added in the new .closest(Array) method, will be used to improve the performance of live filtering.

Browse source
This commit is contained in:
jeresig 2009-12-02 19:05:51 -05:00
parent 62436f4b29
commit e534a310c7
2 changed files with 42 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/traversing.js
View file

@ -54,21 +54,43 @@ jQuery.fn.extend({
return this.pushStack( winnow(this, selector, true), "filter", selector ); return this.pushStack( winnow(this, selector, true), "filter", selector );
}, },
closest: function( selector, context ) { closest: function( selectors, context ) {
var pos = jQuery.expr.match.POS.test( selector ) ? if ( jQuery.isArray( selectors ) ) {
jQuery( selector, context || this.context ) : null; var ret = [], cur = this[0], selector;
return this.map(function(){ if ( cur ) {
var cur = this, closer = 0; for ( var i = 0, l = selectors.length; i < l; i++ ) {
selectors[i] = jQuery.expr.match.POS.test( selector ) ?
jQuery( selector, context || this.context ) :
selectors[i];
}
while ( cur && cur.ownerDocument && cur !== context ) {
for ( var i = 0; i < selectors.length; i++ ) {
selector = selectors[i];
if ( selector.jquery ? selector.index(cur) > -1 : jQuery(cur).is(selector) ) {
selector = selector.selector || selector;
ret.push({ selector: selector, elem: cur });
selectors.splice(i--, 1);
}
}
cur = cur.parentNode;
}
}
return ret;
}
var pos = jQuery.expr.match.POS.test( selectors ) ?
jQuery( selectors, context || this.context ) : null;
return this.map(function(i, cur){
while ( cur && cur.ownerDocument && cur !== context ) { while ( cur && cur.ownerDocument && cur !== context ) {
if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selector) ) { if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selectors) ) {
jQuery.lastCloser = closer;
return cur; return cur;
} }
cur = cur.parentNode; cur = cur.parentNode;
closer++;
} }
jQuery.lastCloser = -1;
return null; return null;
}); });
}, },

11
test/unit/traversing.js
View file

@ -107,6 +107,17 @@ test("closest()", function() {
same( jq.closest("#nothiddendiv", document.body).get(), q("nothiddendiv"), "Context not reached." ); same( jq.closest("#nothiddendiv", document.body).get(), q("nothiddendiv"), "Context not reached." );
}); });
test("closest(Array)", function() {
expect(6);
same( jQuery("body").closest(["body"]), [{selector:"body", elem:document.body}], "closest([body])" );
same( jQuery("body").closest(["html"]), [{selector:"html", elem:document.documentElement}], "closest([html])" );
same( jQuery("body").closest(["div"]), [], "closest([div])" );
same( jQuery("#main").closest(["span,#html"]), [{selector:"span,#html", elem:document.documentElement}], "closest([span,#html])" );
same( jQuery("body").closest(["body","html"]), [{selector:"body", elem:document.body}, {selector:"html", elem:document.documentElement}], "closest([body, html])" );
same( jQuery("body").closest(["span","html"]), [{selector:"html", elem:document.documentElement}], "closest([body, html])" );
});
test("not(Selector)", function() { test("not(Selector)", function() {
expect(7); expect(7);
equals( jQuery("#main > p#ap > a").not("#google").length, 2, "not('selector')" ); equals( jQuery("#main > p#ap > a").not("#google").length, 2, "not('selector')" );