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

Reduce code inbaseBind and baseCreateWrapper and optimize _.bind by adding createCtorWrapper.

Browse Source
This commit is contained in:
John-David Dalton
2014-06-26 09:00:07 -07:00
parent ba5107e801
commit 8a959896bf
1 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
lodash.js
View File

@@ -1173,12 +1173,13 @@
var func = data[0], var func = data[0],
thisArg = data[3], thisArg = data[3],
partialArgs = data[4], partialArgs = data[4],
partialHolders = data[6]; partialHolders = data[6],
Ctor = createCtorWrapper(func);
function bound() { // `Function#bind` spec
// `Function#bind` spec // http://es5.github.io/#x15.3.4.5
// http://es5.github.io/#x15.3.4.5 if (partialArgs) {
if (partialArgs) { var bound = function() {
// avoid `arguments` object use disqualifying optimizations by // avoid `arguments` object use disqualifying optimizations by
// converting it to an array before passing it to `composeArgs` // converting it to an array before passing it to `composeArgs`
var length = arguments.length, var length = arguments.length,
@@ -1188,17 +1189,12 @@
args[length] = arguments[length]; args[length] = arguments[length];
} }
args = composeArgs(partialArgs, partialHolders, args); args = composeArgs(partialArgs, partialHolders, args);
} return (this instanceof bound ? Ctor : func).apply(thisArg, args);
// mimic the constructor's `return` behavior };
// http://es5.github.io/#x13.2.2 } else {
if (this instanceof bound) { bound = function() {
// ensure `new bound` is an instance of `func` return (this instanceof bound ? Ctor : func).apply(thisArg, arguments);
var thisBinding = baseCreate(func.prototype), };
result = func.apply(thisBinding, args || arguments);
return isObject(result) ? result : thisBinding;
}
return func.apply(thisArg, args || arguments);
} }
setData(bound, data); setData(bound, data);
return bound; return bound;
@@ -1415,7 +1411,9 @@
isBindKey = bitmask & BIND_KEY_FLAG, isBindKey = bitmask & BIND_KEY_FLAG,
isCurry = bitmask & CURRY_FLAG, isCurry = bitmask & CURRY_FLAG,
isCurryRight = bitmask & CURRY_RIGHT_FLAG, isCurryRight = bitmask & CURRY_RIGHT_FLAG,
isCurryBound = bitmask & CURRY_BOUND_FLAG, isCurryBound = bitmask & CURRY_BOUND_FLAG;
var Ctor = !isBindKey && createCtorWrapper(func),
key = func; key = func;
function bound() { function bound() {
@@ -1453,12 +1451,7 @@
if (isBindKey) { if (isBindKey) {
func = thisBinding[key]; func = thisBinding[key];
} }
if (this instanceof bound) { return (this instanceof bound ? (Ctor || createCtorWrapper(func)) : func).apply(thisBinding, args);
thisBinding = baseCreate(func.prototype);
var result = func.apply(thisBinding, args);
return isObject(result) ? result : thisBinding;
}
return func.apply(thisBinding, args);
} }
setData(bound, data); setData(bound, data);
return bound; return bound;
@@ -2393,6 +2386,25 @@
return cache; return cache;
}; };
/**
* Creates a function that produces an instance of `Ctor` regardless of
* whether it was invoked as part of a `new` expression or by `call` or `apply`.
*
* @private
* @param {Function} Ctor The constructor to wrap.
* @returns {Function} Returns the new function.
*/
function createCtorWrapper(Ctor) {
return function() {
var thisBinding = baseCreate(Ctor.prototype),
result = Ctor.apply(thisBinding, arguments);
// mimic the constructor's `return` behavior
// http://es5.github.io/#x13.2.2
return isObject(result) ? result : thisBinding;
};
}
/** /**
* Creates the pad required for `string` based on the given padding length. * Creates the pad required for `string` based on the given padding length.
* The `chars` string may be truncated if the number of padding characters * The `chars` string may be truncated if the number of padding characters