Skip to content
Permalink
Browse files

Merge branch 'master' of https://github.com/scottgonzalez/jquery

  • Loading branch information
jeresig committed Jan 14, 2011
2 parents 52a0238 + e5ee89e commit a7ab491a5d3c7347ee5685bd6df11092f0d638ca
Showing with 9 additions and 2 deletions.
  1. +9 −2 src/traversing.js
@@ -6,7 +6,14 @@ var runtil = /Until$/,
rmultiselector = /,/,
isSimple = /^.[^:#\[\.,]*$/,
slice = Array.prototype.slice,
POS = jQuery.expr.match.POS;
POS = jQuery.expr.match.POS,
// methods guaranteed to produce a unique set when starting from a unique set
guaranteedUnique = {
children: true,
contents: true,
next: true,
prev: true
};

jQuery.fn.extend({
find: function( selector ) {
@@ -207,7 +214,7 @@ jQuery.each({
ret = jQuery.filter( selector, ret );
}

ret = this.length > 1 ? jQuery.unique( ret ) : ret;
ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret;

if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) {
ret = ret.reverse();

0 comments on commit a7ab491

Please sign in to comment.
You can’t perform that action at this time.