Bump to v4.14.0.

This commit is contained in:
John-David Dalton
2016-07-24 09:52:33 -07:00
parent 295d8cf415
commit a8d3718760
253 changed files with 2469 additions and 1808 deletions

View File

@@ -1,9 +1,7 @@
var baseFlatten = require('./_baseFlatten'),
baseOrderBy = require('./_baseOrderBy'),
isArray = require('./isArray'),
isFlattenableIteratee = require('./_isFlattenableIteratee'),
isIterateeCall = require('./_isIterateeCall'),
rest = require('./rest');
baseRest = require('./_baseRest'),
isIterateeCall = require('./_isIterateeCall');
/**
* Creates an array of elements, sorted in ascending order by the results of
@@ -16,8 +14,8 @@ var baseFlatten = require('./_baseFlatten'),
* @since 0.1.0
* @category Collection
* @param {Array|Object} collection The collection to iterate over.
* @param {...(Array|Array[]|Function|Function[]|Object|Object[]|string|string[])}
* [iteratees=[_.identity]] The iteratees to sort by.
* @param {...(Function|Function[])} [iteratees=[_.identity]]
* The iteratees to sort by.
* @returns {Array} Returns the new sorted array.
* @example
*
@@ -39,7 +37,7 @@ var baseFlatten = require('./_baseFlatten'),
* });
* // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 40]]
*/
var sortBy = rest(function(collection, iteratees) {
var sortBy = baseRest(function(collection, iteratees) {
if (collection == null) {
return [];
}
@@ -49,11 +47,7 @@ var sortBy = rest(function(collection, iteratees) {
} else if (length > 2 && isIterateeCall(iteratees[0], iteratees[1], iteratees[2])) {
iteratees = [iteratees[0]];
}
iteratees = (iteratees.length == 1 && isArray(iteratees[0]))
? iteratees[0]
: baseFlatten(iteratees, 1, isFlattenableIteratee);
return baseOrderBy(collection, iteratees, []);
return baseOrderBy(collection, baseFlatten(iteratees, 1), []);
});
module.exports = sortBy;