mirror of
https://github.com/jquery/jquery.git
synced 2024-11-23 02:54:22 +00:00
In r1576 on 2007-03-24 the merge() method was split into merge() and
unique() for speed improvement reasons. Document this fact and also be clear about the fact that merge() is a generic function while unique() really works just with jQuery objects.
This commit is contained in:
parent
eabac3f6a1
commit
fd4905b4d9
30
src/jquery/jquery.js
vendored
30
src/jquery/jquery.js
vendored
@ -1644,24 +1644,16 @@ jQuery.extend({
|
|||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Merge two arrays together, removing all duplicates.
|
* Merge two arrays together by concatenating them.
|
||||||
*
|
|
||||||
* The result is the altered first argument with
|
|
||||||
* the unique elements from the second array added.
|
|
||||||
*
|
*
|
||||||
* @example $.merge( [0,1,2], [2,3,4] )
|
* @example $.merge( [0,1,2], [2,3,4] )
|
||||||
* @result [0,1,2,3,4]
|
* @result [0,1,2,2,3,4]
|
||||||
* @desc Merges two arrays, removing the duplicate 2
|
* @desc Merges two arrays.
|
||||||
*
|
|
||||||
* @example var array = [3,2,1];
|
|
||||||
* $.merge( array, [4,3,2] )
|
|
||||||
* @result array == [3,2,1,4]
|
|
||||||
* @desc Merges two arrays, removing the duplicates 3 and 2
|
|
||||||
*
|
*
|
||||||
* @name $.merge
|
* @name $.merge
|
||||||
* @type Array
|
* @type Array
|
||||||
* @param Array first The first array to merge, the unique elements of second added.
|
* @param Array first The first array to merge, the elements of second are added.
|
||||||
* @param Array second The second array to merge into the first, unaltered.
|
* @param Array second The second array to append to the first, unaltered.
|
||||||
* @cat JavaScript
|
* @cat JavaScript
|
||||||
*/
|
*/
|
||||||
merge: function(first, second) {
|
merge: function(first, second) {
|
||||||
@ -1672,6 +1664,18 @@ jQuery.extend({
|
|||||||
return first;
|
return first;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reduce an array (of jQuery objects only) to its unique elements.
|
||||||
|
*
|
||||||
|
* @example $.unique( [x1, x2, x3, x2, x3] )
|
||||||
|
* @result [x1, x2, x3]
|
||||||
|
* @desc Reduces the arrays of jQuery objects to unique elements by removing the duplicates of x2 and x3
|
||||||
|
*
|
||||||
|
* @name $.unique
|
||||||
|
* @type Array
|
||||||
|
* @param Array array The array to reduce to its unique jQuery objects.
|
||||||
|
* @cat JavaScript
|
||||||
|
*/
|
||||||
unique: function(first) {
|
unique: function(first) {
|
||||||
var r = [], num = jQuery.mergeNum++;
|
var r = [], num = jQuery.mergeNum++;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user