Permalink
Browse files

Selector: add jQuery.uniqueSort; deprecate jQuery.unique

Fixes gh-2228
  • Loading branch information...
timmywil committed May 4, 2015
1 parent c916aef commit d9d930f79e9e4edb7339199cd758dc654e053a3b
Showing with 9 additions and 9 deletions.
  1. +1 −1 src/selector-sizzle.js
  2. +3 −3 src/traversing.js
  3. +1 −1 src/traversing/findFilter.js
  4. +3 −3 test/unit/selector.js
  5. +1 −1 test/unit/traversing.js
View
@@ -6,7 +6,7 @@ define([
jQuery.find = Sizzle;
jQuery.expr = Sizzle.selectors;
jQuery.expr[":"] = jQuery.expr.pseudos;
-jQuery.unique = Sizzle.uniqueSort;
+jQuery.uniqueSort = jQuery.unique = Sizzle.uniqueSort;
jQuery.text = Sizzle.getText;
jQuery.isXMLDoc = Sizzle.isXML;
jQuery.contains = Sizzle.contains;
View
@@ -84,7 +84,7 @@ jQuery.fn.extend({
}
}
- return this.pushStack( matched.length > 1 ? jQuery.unique( matched ) : matched );
+ return this.pushStack( matched.length > 1 ? jQuery.uniqueSort( matched ) : matched );
},
// Determine the position of an element within
@@ -109,7 +109,7 @@ jQuery.fn.extend({
add: function( selector, context ) {
return this.pushStack(
- jQuery.unique(
+ jQuery.uniqueSort(
jQuery.merge( this.get(), jQuery( selector, context ) )
)
);
@@ -183,7 +183,7 @@ jQuery.each({
if ( this.length > 1 ) {
// Remove duplicates
if ( !guaranteedUnique[ name ] ) {
- ret = jQuery.unique( ret );
+ ret = jQuery.uniqueSort( ret );
}
// Reverse order for parents* and prev-derivatives
@@ -72,7 +72,7 @@ jQuery.fn.extend({
jQuery.find( selector, self[ i ], ret );
}
- return this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
+ return this.pushStack( len > 1 ? jQuery.uniqueSort( ret ) : ret );
},
filter: function( selector ) {
return this.pushStack( winnow(this, selector || [], false) );
View
@@ -385,7 +385,7 @@ test( "jQuery.contains", function() {
ok( !jQuery.contains(document, detached), "document container (negative)" );
});
-test("jQuery.unique", function() {
+test("jQuery.uniqueSort", function() {
expect( 14 );
function Arrayish( arr ) {
@@ -459,8 +459,8 @@ test("jQuery.unique", function() {
jQuery.each( tests, function( label, test ) {
var length = test.length || test.input.length;
- deepEqual( jQuery.unique( test.input ).slice( 0, length ), test.expected, label + " (array)" );
- deepEqual( jQuery.unique( new Arrayish(test.input) ).slice( 0, length ), test.expected, label + " (quasi-array)" );
+ deepEqual( jQuery.uniqueSort( test.input ).slice( 0, length ), test.expected, label + " (array)" );
+ deepEqual( jQuery.uniqueSort( new Arrayish(test.input) ).slice( 0, length ), test.expected, label + " (quasi-array)" );
});
});
View
@@ -696,7 +696,7 @@ test("sort direction", function() {
jQuery.each( methodDirections, function( method, reversed ) {
var actual = elems[ method ]().get(),
- forward = jQuery.unique( [].concat( actual ) );
+ forward = jQuery.uniqueSort( [].concat( actual ) );
deepEqual( actual, reversed ? forward.reverse() : forward, "Correct sort direction for " + method );
});
});

0 comments on commit d9d930f

Please sign in to comment.