Selector: add jQuery.uniqueSort; deprecate jQuery.unique

timmywil · timmywil · commit d9d930f79e9e · 2015-05-04T15:28:44.000-07:00
Fixes gh-2228
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 );
 	});
 });

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ jQuery.fn.extend({`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
`87`		`- return this.pushStack( matched.length > 1 ? jQuery.unique( matched ) : matched );`
	`87`	`+ return this.pushStack( matched.length > 1 ? jQuery.uniqueSort( matched ) : matched );`
`88`	`88`	`},`
`89`	`89`
`90`	`90`	`// Determine the position of an element within`
`@@ -109,7 +109,7 @@ jQuery.fn.extend({`
`109`	`109`
`110`	`110`	`add: function( selector, context ) {`
`111`	`111`	`return this.pushStack(`
`112`		`- jQuery.unique(`
	`112`	`+ jQuery.uniqueSort(`
`113`	`113`	`jQuery.merge( this.get(), jQuery( selector, context ) )`
`114`	`114`	`)`
`115`	`115`	`);`
`@@ -183,7 +183,7 @@ jQuery.each({`
`183`	`183`	`if ( this.length > 1 ) {`
`184`	`184`	`// Remove duplicates`
`185`	`185`	`if ( !guaranteedUnique[ name ] ) {`
`186`		`- ret = jQuery.unique( ret );`
	`186`	`+ ret = jQuery.uniqueSort( ret );`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`// Reverse order for parents* and prev-derivatives`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ jQuery.fn.extend({`
`72`	`72`	`jQuery.find( selector, self[ i ], ret );`
`73`	`73`	`}`
`74`	`74`
`75`		`- return this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );`
	`75`	`+ return this.pushStack( len > 1 ? jQuery.uniqueSort( ret ) : ret );`
`76`	`76`	`},`
`77`	`77`	`filter: function( selector ) {`
`78`	`78`	`return this.pushStack( winnow(this, selector \|\| [], false) );`