X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcore.js;h=30820bf9ee1952ddb9c0cbed6192072361a6e0d3;hb=da33a981c6fb18a195377d55a6d243e2de887f45;hp=53d5f4a4b1601bd0c4e83a00051d659beb0aaf05;hpb=3e3b86c7a7437c7b0416a2ac8385cf9403fc9e28;p=jquery.git diff --git a/src/core.js b/src/core.js index 53d5f4a..30820bf 100644 --- a/src/core.js +++ b/src/core.js @@ -342,15 +342,14 @@ jQuery.fn = jQuery.prototype = { }, not: function( selector ) { - return this.pushStack( - selector.constructor == String && - jQuery.multiFilter( selector, this, true ) || - - jQuery.grep(this, function(elem) { - return selector.constructor == Array || selector.jquery ? - jQuery.inArray( elem, selector ) < 0 : - elem != selector; - }) ); + if (selector.constructor == String) + // test special case where just one selector is passed in + if ( /^.[^:#\[\.]*$/.test(selector) ) + return this.pushStack( jQuery.multiFilter( selector, this, true ) ); + else + selector = jQuery.multiFilter( selector, this ); + + return this.pushStack( jQuery.removeFromArray( selector, this ) ); }, add: function( selector ) { @@ -1093,6 +1092,13 @@ jQuery.extend({ return -1; }, + removeFromArray: function( remove, from ) { + var isArrayLike = remove.length && remove[remove.length - 1] !== undefined; + return jQuery.grep(from, function(elem) { + return isArrayLike ? jQuery.inArray( elem, remove ) < 0 : elem != from; + }); + }, + merge: function( first, second ) { // We have to loop this way because IE & Opera overwrite the length // expando of getElementsByTagName