Bump to v4.12.0.

This commit is contained in:
John-David Dalton
2016-05-07 12:00:39 -07:00
parent ddde027fd9
commit dbe6a9008c
127 changed files with 1258 additions and 1116 deletions

View File

@@ -189,25 +189,21 @@ function baseConvert(util, name, func, options) {
if (!isFunction(func)) {
return mixin(func, Object(source));
}
var methods = [],
methodNames = [];
var pairs = [];
each(keys(source), function(key) {
var value = source[key];
if (isFunction(value)) {
methodNames.push(key);
methods.push(func.prototype[key]);
if (isFunction(source[key])) {
pairs.push([key, func.prototype[key]]);
}
});
mixin(func, Object(source));
each(methodNames, function(methodName, index) {
var method = methods[index];
if (isFunction(method)) {
func.prototype[methodName] = method;
each(pairs, function(pair) {
var value = pair[1];
if (isFunction(value)) {
func.prototype[pair[0]] = value;
} else {
delete func.prototype[methodName];
delete func.prototype[pair[0]];
}
});
return func;
@@ -235,6 +231,7 @@ function baseConvert(util, name, func, options) {
var index = -1,
length = path.length,
lastIndex = length - 1,
result = clone(Object(object)),
nested = result;
@@ -243,7 +240,7 @@ function baseConvert(util, name, func, options) {
value = nested[key];
if (value != null) {
nested[key] = clone(Object(value));
nested[path[index]] = clone(index == lastIndex ? value : Object(value));
}
nested = nested[key];
}