Selector: add jQuery.uniqueSort; deprecate jQuery.unique

Fixes gh-2228

diff --git a/src/selector-sizzle.js b/src/selector-sizzle.js
index 7d3926b1a989436e07b8815e852eda32f6ba4f60..c091f1821690cc211755ba8e7399b2d677ccbf09 100644 (file)
--- a/src/selector-sizzle.js
+++ b/src/selector-sizzle.js
@@ -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;

diff --git a/src/traversing.js b/src/traversing.js
index 9f3de7af10c6b010717a3d4d186319484c8fc01d..c427792c18f3cf0a47d2bf9a13141d59730cd92d 100644 (file)
--- a/src/traversing.js
+++ b/src/traversing.js
@@ -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

diff --git a/src/traversing/findFilter.js b/src/traversing/findFilter.js
index 2c2f461612a3a0cdb207d506cdbf1bac357ef3d0..0039b95b02ac02222d4f8bdf57c384bf7a0a40be 100644 (file)
--- a/src/traversing/findFilter.js
+++ b/src/traversing/findFilter.js
@@ -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) );

diff --git a/test/unit/selector.js b/test/unit/selector.js
index 673a86f85725b783e48a645e977aa48b4347ec3c..19b2c2210fe9dfe906c4b40df9a3808a982f3ffe 100644 (file)
--- a/test/unit/selector.js
+++ b/test/unit/selector.js
@@ -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)" );
        });
 });
 

diff --git a/test/unit/traversing.js b/test/unit/traversing.js
index 1be1992cdb2058ba6ca2aceba18e293075b3b7fd..db58beec31604aa1d4474bc797dd91eae7bbd039 100644 (file)
--- a/test/unit/traversing.js
+++ b/test/unit/traversing.js
@@ -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 );
        });
 });