Drop boolean orders param support in _.sortByOrder.

This commit is contained in:
John-David Dalton
2015-07-09 19:42:04 -07:00
parent 2586129dcd
commit 2da1b2af1a
2 changed files with 9 additions and 13 deletions

View File

@@ -473,7 +473,7 @@
return result; return result;
} }
var order = orders[index]; var order = orders[index];
return result * ((order === 'asc' || order === true) ? 1 : -1); return result * (order === 'asc' ? 1 : -1);
} }
} }
// Fixes an `Array#sort` bug in the JS engine embedded in Adobe applications // Fixes an `Array#sort` bug in the JS engine embedded in Adobe applications
@@ -2647,7 +2647,7 @@
* @private * @private
* @param {Array|Object|string} collection The collection to iterate over. * @param {Array|Object|string} collection The collection to iterate over.
* @param {Function[]|Object[]|string[]} iteratees The iteratees to sort by. * @param {Function[]|Object[]|string[]} iteratees The iteratees to sort by.
* @param {boolean[]|string[]} orders The sort orders of `iteratees`. * @param {string[]} orders The sort orders of `iteratees`.
* @returns {Array} Returns the new sorted array. * @returns {Array} Returns the new sorted array.
*/ */
function baseSortByOrder(collection, iteratees, orders) { function baseSortByOrder(collection, iteratees, orders) {
@@ -6679,7 +6679,7 @@
* @category Collection * @category Collection
* @param {Array|Object|string} collection The collection to iterate over. * @param {Array|Object|string} collection The collection to iterate over.
* @param {Function[]|Object[]|string[]} [iteratees=[_.identity]] The iteratees to sort by. * @param {Function[]|Object[]|string[]} [iteratees=[_.identity]] The iteratees to sort by.
* @param {boolean[]|string[]} [orders] The sort orders of `iteratees`. * @param {string[]} [orders] The sort orders of `iteratees`.
* @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`. * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
* @returns {Array} Returns the new sorted array. * @returns {Array} Returns the new sorted array.
* @example * @example

View File

@@ -14173,18 +14173,14 @@
{ 'a': 'y', 'b': 2 } { 'a': 'y', 'b': 2 }
]; ];
test('should sort multiple properties by specified orders', 2, function() { test('should sort multiple properties by specified orders', 1, function() {
_.each([[false, true], ['desc', 'asc']], function(orders) { var actual = _.sortByOrder(objects, ['a', 'b'], ['desc', 'asc']);
var actual = _.sortByOrder(objects, ['a', 'b'], orders); deepEqual(actual, [objects[3], objects[1], objects[2], objects[0]]);
deepEqual(actual, [objects[3], objects[1], objects[2], objects[0]]);
});
}); });
test('should sort a property in ascending order when its order is not specified', 2, function() { test('should sort a property in ascending order when its order is not specified', 1, function() {
_.each([[false], ['desc']], function(orders) { var actual = _.sortByOrder(objects, ['a', 'b'], ['desc']);
var actual = _.sortByOrder(objects, ['a', 'b'], orders); deepEqual(actual, [objects[3], objects[1], objects[2], objects[0]]);
deepEqual(actual, [objects[3], objects[1], objects[2], objects[0]]);
});
}); });
}()); }());