mirror of
https://github.com/whoisclebs/lodash.git
synced 2026-02-04 00:57:48 +00:00
Bump to v3.10.0.
This commit is contained in:
@@ -10,7 +10,7 @@ var assignWith = require('../internal/assignWith'),
|
||||
* (objectValue, sourceValue, key, object, source).
|
||||
*
|
||||
* **Note:** This method mutates `object` and is based on
|
||||
* [`Object.assign`](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-object.assign).
|
||||
* [`Object.assign`](http://ecma-international.org/ecma-262/6.0/#sec-object.assign).
|
||||
*
|
||||
* @static
|
||||
* @memberOf _
|
||||
|
||||
@@ -39,7 +39,7 @@ var baseAssign = require('../internal/baseAssign'),
|
||||
function create(prototype, properties, guard) {
|
||||
var result = baseCreate(prototype);
|
||||
if (guard && isIterateeCall(prototype, properties, guard)) {
|
||||
properties = null;
|
||||
properties = undefined;
|
||||
}
|
||||
return properties ? baseAssign(result, properties) : result;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
var assign = require('./assign'),
|
||||
assignDefaults = require('../internal/assignDefaults'),
|
||||
restParam = require('../function/restParam');
|
||||
createDefaults = require('../internal/createDefaults');
|
||||
|
||||
/**
|
||||
* Assigns own enumerable properties of source object(s) to the destination
|
||||
@@ -20,13 +20,6 @@ var assign = require('./assign'),
|
||||
* _.defaults({ 'user': 'barney' }, { 'age': 36 }, { 'user': 'fred' });
|
||||
* // => { 'user': 'barney', 'age': 36 }
|
||||
*/
|
||||
var defaults = restParam(function(args) {
|
||||
var object = args[0];
|
||||
if (object == null) {
|
||||
return object;
|
||||
}
|
||||
args.push(assignDefaults);
|
||||
return assign.apply(undefined, args);
|
||||
});
|
||||
var defaults = createDefaults(assign, assignDefaults);
|
||||
|
||||
module.exports = defaults;
|
||||
|
||||
25
object/defaultsDeep.js
Normal file
25
object/defaultsDeep.js
Normal file
@@ -0,0 +1,25 @@
|
||||
var createDefaults = require('../internal/createDefaults'),
|
||||
merge = require('./merge'),
|
||||
mergeDefaults = require('../internal/mergeDefaults');
|
||||
|
||||
/**
|
||||
* This method is like `_.defaults` except that it recursively assigns
|
||||
* default properties.
|
||||
*
|
||||
* **Note:** This method mutates `object`.
|
||||
*
|
||||
* @static
|
||||
* @memberOf _
|
||||
* @category Object
|
||||
* @param {Object} object The destination object.
|
||||
* @param {...Object} [sources] The source objects.
|
||||
* @returns {Object} Returns `object`.
|
||||
* @example
|
||||
*
|
||||
* _.defaultsDeep({ 'user': { 'name': 'barney' } }, { 'user': { 'name': 'fred', 'age': 36 } });
|
||||
* // => { 'user': { 'name': 'barney', 'age': 36 } }
|
||||
*
|
||||
*/
|
||||
var defaultsDeep = createDefaults(merge, mergeDefaults);
|
||||
|
||||
module.exports = defaultsDeep;
|
||||
@@ -32,7 +32,7 @@ var hasOwnProperty = objectProto.hasOwnProperty;
|
||||
*/
|
||||
function invert(object, multiValue, guard) {
|
||||
if (guard && isIterateeCall(object, multiValue, guard)) {
|
||||
multiValue = null;
|
||||
multiValue = undefined;
|
||||
}
|
||||
var index = -1,
|
||||
props = keys(object),
|
||||
|
||||
@@ -10,7 +10,7 @@ var nativeKeys = getNative(Object, 'keys');
|
||||
* Creates an array of the own enumerable property names of `object`.
|
||||
*
|
||||
* **Note:** Non-object values are coerced to objects. See the
|
||||
* [ES spec](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-object.keys)
|
||||
* [ES spec](http://ecma-international.org/ecma-262/6.0/#sec-object.keys)
|
||||
* for more details.
|
||||
*
|
||||
* @static
|
||||
@@ -34,7 +34,7 @@ var nativeKeys = getNative(Object, 'keys');
|
||||
* // => ['0', '1']
|
||||
*/
|
||||
var keys = !nativeKeys ? shimKeys : function(object) {
|
||||
var Ctor = object == null ? null : object.constructor;
|
||||
var Ctor = object == null ? undefined : object.constructor;
|
||||
if ((typeof Ctor == 'function' && Ctor.prototype === object) ||
|
||||
(typeof object != 'function' && isArrayLike(object))) {
|
||||
return shimKeys(object);
|
||||
|
||||
@@ -46,7 +46,7 @@ function transform(object, iteratee, accumulator, thisArg) {
|
||||
if (isArr) {
|
||||
accumulator = isArray(object) ? new Ctor : [];
|
||||
} else {
|
||||
accumulator = baseCreate(isFunction(Ctor) ? Ctor.prototype : null);
|
||||
accumulator = baseCreate(isFunction(Ctor) ? Ctor.prototype : undefined);
|
||||
}
|
||||
} else {
|
||||
accumulator = {};
|
||||
|
||||
Reference in New Issue
Block a user