Merge branch 'bug_2773' of https://github.com/timmywil/jquery into timmywil-bug_2773

This commit is contained in:
jeresig 2011-04-10 16:31:10 -04:00
commit b8fd1f03a6
2 changed files with 53 additions and 9 deletions

View file

@ -60,7 +60,8 @@ jQuery.fn.extend({
},
is: function( selector ) {
return !!selector && jQuery.filter( selector, this ).length > 0;
return !!selector && (typeof selector === "string" ? jQuery.filter( selector, this ).length > 0 :
this.filter( selector ).length > 0);
},
closest: function( selectors, context ) {
@ -286,7 +287,7 @@ function winnow( elements, qualifier, keep ) {
return retVal === keep;
});
} else if ( qualifier.nodeType ) {
} else if ( qualifier && qualifier.nodeType ) {
return jQuery.grep(elements, function( elem, i ) {
return (elem === qualifier) === keep;
});