-jQuery.winnow = function( elements, qualifier, keep ) {
+var winnow = function( elements, qualifier, keep ) {
if(jQuery.isFunction( qualifier )) {
return jQuery.grep(elements, function(elem, i) {
return !!qualifier.call( elem, i ) === keep;
} else if( typeof qualifier === "string" ) {
var filtered = jQuery.grep(elements, function(elem) { return elem.nodeType === 1 });
- if(isSimple.test( qualifier )) return jQuery.multiFilter(qualifier, filtered, !keep);
- else qualifier = jQuery.multiFilter( qualifier, elements );
+ if(isSimple.test( qualifier )) {
+ return jQuery.filter(qualifier, filtered, !keep);
+ } else {
+ qualifier = jQuery.filter( qualifier, elements );
+ }
}
return jQuery.grep(elements, function(elem, i) {
},
not: function( selector ) {
- return this.pushStack( jQuery.winnow(this, selector, false), "not", selector);
+ return this.pushStack( winnow(this, selector, false), "not", selector);
},
filter: function( selector ) {
- return this.pushStack( jQuery.winnow(this, selector, true), "filter", selector );
+ return this.pushStack( winnow(this, selector, true), "filter", selector );
},
closest: function( selector, context ) {
- var pos = jQuery.expr.match.POS.test( selector ) ? jQuery(selector) : null,
- closer = 0;
+ var pos = jQuery.expr.match.POS.test( selector ) ?
+ jQuery( selector, context || this.context ) : null;
return this.map(function(){
- var cur = this;
+ var cur = this, closer = 0;
while ( cur && cur.ownerDocument && cur !== context ) {
if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selector) ) {
- jQuery.data(cur, "closest", closer);
+ jQuery.lastCloser = closer;
return cur;
}
cur = cur.parentNode;
closer++;
}
+ jQuery.lastCloser = -1;
+ return null;
});
},
- add: function( selector ) {
- return this.pushStack( jQuery.unique( jQuery.merge(
- this.get(),
- typeof selector === "string" ?
- jQuery( selector ) :
- jQuery.makeArray( selector )
- )));
+ add: function( selector, context ) {
+ var set = typeof selector === "string" ?
+ jQuery( selector, context || this.context ) :
+ jQuery.makeArray( selector ),
+ all = jQuery.merge( this.get(), set );
+
+ return this.pushStack( set[0] && (set[0].setInterval || set[0].nodeType === 9 || (set[0].parentNode && set[0].parentNode.nodeType !== 11)) ?
+ jQuery.unique( all ) :
+ all );
},
eq: function( i ) {
jQuery.fn[ name ] = function( selector ) {
var ret = jQuery.map( this, fn );
- if ( selector && typeof selector == "string" )
- ret = jQuery.multiFilter( selector, ret );
+ if ( selector && typeof selector === "string" ) {
+ ret = jQuery.filter( selector, ret );
+ }
+
+ ret = this.length > 1 ? jQuery.unique( ret ) : ret;
- return this.pushStack( jQuery.unique( ret ), name, selector );
+ if ( name === "parents" && this.length > 1 ) {
+ ret = ret.reverse();
+ }
+
+ return this.pushStack( ret, name, selector );
};
});
+
+jQuery.extend({
+ filter: function( expr, elems, not ) {
+ if ( not ) {
+ expr = ":not(" + expr + ")";
+ }
+
+ return jQuery.find.matches(expr, elems);
+ },
+
+ dir: function( elem, dir ) {
+ var matched = [], cur = elem[dir];
+ while ( cur && cur.nodeType !== 9 ) {
+ if ( cur.nodeType === 1 ) {
+ matched.push( cur );
+ }
+ cur = cur[dir];
+ }
+ return matched;
+ },
+
+ nth: function( cur, result, dir, elem ) {
+ result = result || 1;
+ var num = 0;
+
+ for ( ; cur; cur = cur[dir] ) {
+ if ( cur.nodeType === 1 && ++num === result ) {
+ break;
+ }
+ }
+
+ return cur;
+ },
+
+ sibling: function( n, elem ) {
+ var r = [];
+
+ for ( ; n; n = n.nextSibling ) {
+ if ( n.nodeType === 1 && n !== elem ) {
+ r.push( n );
+ }
+ }
+
+ return r;
+ }
+});