Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-09 10:27:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimize _.every and _.some and cleanup _.callback, _.forEach, and _.forEachRight.

Browse Source
This commit is contained in:
John-David Dalton
2014-05-20 17:06:47 -07:00
parent 789eb59904
commit 76828a87ee
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lodash.js
View File

@@ -4034,8 +4034,10 @@
*/ */
function every(collection, predicate, thisArg) { function every(collection, predicate, thisArg) {
var result = true; var result = true;
predicate = lodash.createCallback(predicate, thisArg, 3);
if (typeof predicate != 'function' || typeof thisArg != 'undefined') {
predicate = lodash.createCallback(predicate, thisArg, 3);
}
if (isArray(collection)) { if (isArray(collection)) {
var index = -1, var index = -1,
length = collection.length; length = collection.length;
@@ -4249,7 +4251,7 @@
* // => logs each number and returns the object (property order is not guaranteed across environments) * // => logs each number and returns the object (property order is not guaranteed across environments)
*/ */
function forEach(collection, callback, thisArg) { function forEach(collection, callback, thisArg) {
return (callback && typeof thisArg == 'undefined' && isArray(collection)) return (typeof callback == 'function' && typeof thisArg == 'undefined' && isArray(collection))
? arrayEach(collection, callback) ? arrayEach(collection, callback)
: baseEach(collection, baseCreateCallback(callback, thisArg, 3)); : baseEach(collection, baseCreateCallback(callback, thisArg, 3));
} }
@@ -4272,7 +4274,7 @@
* // => logs each number from right to left and returns '3,2,1' * // => logs each number from right to left and returns '3,2,1'
*/ */
function forEachRight(collection, callback, thisArg) { function forEachRight(collection, callback, thisArg) {
return (callback && typeof thisArg == 'undefined' && isArray(collection)) return (typeof callback == 'function' && typeof thisArg == 'undefined' && isArray(collection))
? arrayEachRight(collection, callback) ? arrayEachRight(collection, callback)
: baseEachRight(collection, baseCreateCallback(callback, thisArg, 3)); : baseEachRight(collection, baseCreateCallback(callback, thisArg, 3));
} }
@@ -4930,8 +4932,10 @@
*/ */
function some(collection, predicate, thisArg) { function some(collection, predicate, thisArg) {
var result; var result;
predicate = lodash.createCallback(predicate, thisArg, 3);
if (typeof predicate != 'function' || typeof thisArg != 'undefined') {
predicate = lodash.createCallback(predicate, thisArg, 3);
}
if (isArray(collection)) { if (isArray(collection)) {
var index = -1, var index = -1,
length = collection.length; length = collection.length;
@@ -6115,7 +6119,9 @@
* // => logs 'x', 'y', and 'z' (property order is not guaranteed across environments) * // => logs 'x', 'y', and 'z' (property order is not guaranteed across environments)
*/ */
function forIn(object, callback, thisArg) { function forIn(object, callback, thisArg) {
callback = callback && typeof thisArg == 'undefined' ? callback : baseCreateCallback(callback, thisArg, 3); if (typeof callback != 'function' || typeof thisArg != 'undefined') {
callback = baseCreateCallback(callback, thisArg, 3);
}
return baseFor(object, callback, keysIn); return baseFor(object, callback, keysIn);
} }
@@ -6170,7 +6176,9 @@
* // => logs '0', '1', and 'length' (property order is not guaranteed across environments) * // => logs '0', '1', and 'length' (property order is not guaranteed across environments)
*/ */
function forOwn(object, callback, thisArg) { function forOwn(object, callback, thisArg) {
callback = callback && typeof thisArg == 'undefined' ? callback : baseCreateCallback(callback, thisArg, 3); if (typeof callback != 'function' || typeof thisArg != 'undefined') {
callback = baseCreateCallback(callback, thisArg, 3);
}
return baseForOwn(object, callback); return baseForOwn(object, callback);
} }
@@ -7972,10 +7980,14 @@
* // => [{ 'name': 'fred', 'age': 40 }] * // => [{ 'name': 'fred', 'age': 40 }]
*/ */
function createCallback(func, thisArg, argCount) { function createCallback(func, thisArg, argCount) {
var type = typeof func; var type = typeof func,
if (type == 'function' || func == null) { isFunc = type == 'function';
return (typeof thisArg == 'undefined' || !(func && 'prototype' in func)) &&
func || baseCreateCallback(func, thisArg, argCount); if (isFunc && (typeof thisArg == 'undefined' || !('prototype' in func))) {
return func;
}
if (isFunc || func == null) {
return baseCreateCallback(func, thisArg, argCount);
} }
// handle "_.pluck" and "_.where" style callback shorthands // handle "_.pluck" and "_.where" style callback shorthands
return type == 'object' ? matches(func) : property(func); return type == 'object' ? matches(func) : property(func);