mirror of
https://github.com/whoisclebs/lodash.git
synced 2026-02-10 02:47:50 +00:00
Update vendor/underscore.
Former-commit-id: 3d39397aaee8408778b738c3aa105eda67abd6bc
This commit is contained in:
2
vendor/underscore/test/arrays.js
vendored
2
vendor/underscore/test/arrays.js
vendored
@@ -91,6 +91,8 @@ $(document).ready(function() {
|
|||||||
var iterator = function(value) { return value.name; };
|
var iterator = function(value) { return value.name; };
|
||||||
equal(_.map(_.uniq(list, false, iterator), iterator).join(', '), 'moe, curly, larry', 'can find the unique values of an array using a custom iterator');
|
equal(_.map(_.uniq(list, false, iterator), iterator).join(', '), 'moe, curly, larry', 'can find the unique values of an array using a custom iterator');
|
||||||
|
|
||||||
|
equal(_.map(_.uniq(list, iterator), iterator).join(', '), 'moe, curly, larry', 'can find the unique values of an array using a custom iterator without specifying whether array is sorted');
|
||||||
|
|
||||||
var iterator = function(value) { return value +1; };
|
var iterator = function(value) { return value +1; };
|
||||||
var list = [1, 2, 2, 3, 4, 4];
|
var list = [1, 2, 2, 3, 4, 4];
|
||||||
equal(_.uniq(list, true, iterator).join(', '), '1, 2, 3, 4', 'iterator works with sorted array');
|
equal(_.uniq(list, true, iterator).join(', '), '1, 2, 3, 4', 'iterator works with sorted array');
|
||||||
|
|||||||
2
vendor/underscore/underscore-min.js
vendored
2
vendor/underscore/underscore-min.js
vendored
File diff suppressed because one or more lines are too long
11
vendor/underscore/underscore.js
vendored
11
vendor/underscore/underscore.js
vendored
@@ -213,13 +213,11 @@
|
|||||||
// Determine if the array or object contains a given value (using `===`).
|
// Determine if the array or object contains a given value (using `===`).
|
||||||
// Aliased as `include`.
|
// Aliased as `include`.
|
||||||
_.contains = _.include = function(obj, target) {
|
_.contains = _.include = function(obj, target) {
|
||||||
var found = false;
|
if (obj == null) return false;
|
||||||
if (obj == null) return found;
|
|
||||||
if (nativeIndexOf && obj.indexOf === nativeIndexOf) return obj.indexOf(target) != -1;
|
if (nativeIndexOf && obj.indexOf === nativeIndexOf) return obj.indexOf(target) != -1;
|
||||||
found = any(obj, function(value) {
|
return any(obj, function(value) {
|
||||||
return value === target;
|
return value === target;
|
||||||
});
|
});
|
||||||
return found;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// Invoke a method (with arguments) on every item in a collection.
|
// Invoke a method (with arguments) on every item in a collection.
|
||||||
@@ -439,6 +437,11 @@
|
|||||||
// been sorted, you have the option of using a faster algorithm.
|
// been sorted, you have the option of using a faster algorithm.
|
||||||
// Aliased as `unique`.
|
// Aliased as `unique`.
|
||||||
_.uniq = _.unique = function(array, isSorted, iterator, context) {
|
_.uniq = _.unique = function(array, isSorted, iterator, context) {
|
||||||
|
if (_.isFunction(isSorted)) {
|
||||||
|
context = iterator;
|
||||||
|
iterator = isSorted;
|
||||||
|
isSorted = false;
|
||||||
|
}
|
||||||
var initial = iterator ? _.map(array, iterator, context) : array;
|
var initial = iterator ? _.map(array, iterator, context) : array;
|
||||||
var results = [];
|
var results = [];
|
||||||
var seen = [];
|
var seen = [];
|
||||||
|
|||||||
Reference in New Issue
Block a user