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

adding back style and implementation tweaks from #385

Browse Source
This commit is contained in:
Jeremy Ashkenas
2011-12-07 09:29:11 -05:00
parent 9e41927293
commit c67eaf672b
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
underscore.js
View File

@@ -189,7 +189,7 @@
// Delegates to **ECMAScript 5**'s native `some` if available. // Delegates to **ECMAScript 5**'s native `some` if available.
// Aliased as `any`. // Aliased as `any`.
var any = _.some = _.any = function(obj, iterator, context) { var any = _.some = _.any = function(obj, iterator, context) {
iterator = iterator || _.identity; iterator || (iterator = _.identity);
var result = false; var result = false;
if (obj == null) return result; if (obj == null) return result;
if (nativeSome && obj.some === nativeSome) return obj.some(iterator, context); if (nativeSome && obj.some === nativeSome) return obj.some(iterator, context);
@@ -588,7 +588,7 @@
// conditionally execute the original function. // conditionally execute the original function.
_.wrap = function(func, wrapper) { _.wrap = function(func, wrapper) {
return function() { return function() {
var args = [func].concat(slice.call(arguments)); var args = concat.apply([func], arguments);
return wrapper.apply(this, args); return wrapper.apply(this, args);
}; };
}; };
@@ -596,9 +596,9 @@
// Returns a function that is the composition of a list of functions, each // Returns a function that is the composition of a list of functions, each
// consuming the return value of the function that follows. // consuming the return value of the function that follows.
_.compose = function() { _.compose = function() {
var funcs = slice.call(arguments); var funcs = arguments;
return function() { return function() {
var args = slice.call(arguments); var args = arguments;
for (var i = funcs.length - 1; i >= 0; i--) { for (var i = funcs.length - 1; i >= 0; i--) {
args = [funcs[i].apply(this, args)]; args = [funcs[i].apply(this, args)];
} }
@@ -686,8 +686,8 @@
if (a._chain) a = a._wrapped; if (a._chain) a = a._wrapped;
if (b._chain) b = b._wrapped; if (b._chain) b = b._wrapped;
// Invoke a custom `isEqual` method if one is provided. // Invoke a custom `isEqual` method if one is provided.
if (_.isFunction(a.isEqual)) return a.isEqual(b); if (a.isEqual && _.isFunction(a.isEqual)) return a.isEqual(b);
if (_.isFunction(b.isEqual)) return b.isEqual(a); if (b.isEqual && _.isFunction(b.isEqual)) return b.isEqual(a);
// Compare `[[Class]]` names. // Compare `[[Class]]` names.
var className = toString.call(a); var className = toString.call(a);
if (className != toString.call(b)) return false; if (className != toString.call(b)) return false;
@@ -696,13 +696,11 @@
case '[object String]': case '[object String]':
// Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is
// equivalent to `new String("5")`. // equivalent to `new String("5")`.
return String(a) == String(b); return a == String(b);
case '[object Number]': case '[object Number]':
a = +a;
b = +b;
// `NaN`s are equivalent, but non-reflexive. An `egal` comparison is performed for // `NaN`s are equivalent, but non-reflexive. An `egal` comparison is performed for
// other numeric values. // other numeric values.
return a != a ? b != b : (a == 0 ? 1 / a == 1 / b : a == b); return a != +a ? b != +b : (a == 0 ? 1 / a == 1 / b : a == +b);
case '[object Date]': case '[object Date]':
case '[object Boolean]': case '[object Boolean]':
// Coerce dates and booleans to numeric primitive values. Dates are compared by their // Coerce dates and booleans to numeric primitive values. Dates are compared by their
@@ -742,7 +740,7 @@
} }
} else { } else {
// Objects with different constructors are not equivalent. // Objects with different constructors are not equivalent.
if ("constructor" in a != "constructor" in b || a.constructor != b.constructor) return false; if ('constructor' in a != 'constructor' in b || a.constructor != b.constructor) return false;
// Deep compare objects. // Deep compare objects.
for (var key in a) { for (var key in a) {
if (hasOwnProperty.call(a, key)) { if (hasOwnProperty.call(a, key)) {
@@ -795,11 +793,10 @@
}; };
// Is a given variable an arguments object? // Is a given variable an arguments object?
if (toString.call(arguments) == '[object Arguments]') { _.isArguments = function(obj) {
_.isArguments = function(obj) { return toString.call(obj) == '[object Arguments]';
return toString.call(obj) == '[object Arguments]'; };
}; if (!_.isArguments(arguments)) {
} else {
_.isArguments = function(obj) { _.isArguments = function(obj) {
return !!(obj && hasOwnProperty.call(obj, 'callee')); return !!(obj && hasOwnProperty.call(obj, 'callee'));
}; };