lodash.merge
Advanced tools
Comparing version 3.0.3 to 3.1.0
25
index.js
/** | ||
* lodash 3.0.3 (Custom Build) <https://lodash.com/> | ||
* lodash 3.1.0 (Custom Build) <https://lodash.com/> | ||
* Build: `lodash modern modularize exports="npm" -o ./` | ||
@@ -15,5 +15,7 @@ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/> | ||
isArray = require('lodash.isarray'), | ||
isNative = require('lodash.isnative'), | ||
isPlainObject = require('lodash.isplainobject'), | ||
isTypedArray = require('lodash.istypedarray'), | ||
keys = require('lodash.keys'), | ||
keysIn = require('lodash.keysin'), | ||
toPlainObject = require('lodash.toplainobject'); | ||
@@ -29,9 +31,8 @@ | ||
function isObjectLike(value) { | ||
return (value && typeof value == 'object') || false; | ||
return !!value && typeof value == 'object'; | ||
} | ||
/** | ||
* Used as the maximum length of an array-like value. | ||
* See the [ES spec](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.max_safe_integer) | ||
* for more details. | ||
* Used as the [maximum length](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.max_safe_integer) | ||
* of an array-like value. | ||
*/ | ||
@@ -125,3 +126,3 @@ var MAX_SAFE_INTEGER = Math.pow(2, 53) - 1; | ||
? value | ||
: (value ? arrayCopy(value) : []); | ||
: ((value && value.length) ? arrayCopy(value) : []); | ||
} | ||
@@ -153,5 +154,3 @@ else if (isPlainObject(srcValue) || isArguments(srcValue)) { | ||
* | ||
* **Note:** This function is based on ES `ToLength`. See the | ||
* [ES spec](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-tolength) | ||
* for more details. | ||
* **Note:** This function is based on [`ToLength`](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-tolength). | ||
* | ||
@@ -167,7 +166,5 @@ * @private | ||
/** | ||
* Checks if `value` is the language type of `Object`. | ||
* Checks if `value` is the [language type](https://es5.github.io/#x8) of `Object`. | ||
* (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`) | ||
* | ||
* **Note:** See the [ES5 spec](https://es5.github.io/#x8) for more details. | ||
* | ||
* @static | ||
@@ -193,3 +190,3 @@ * @memberOf _ | ||
var type = typeof value; | ||
return type == 'function' || (value && type == 'object') || false; | ||
return type == 'function' || (!!value && type == 'object'); | ||
} | ||
@@ -204,3 +201,3 @@ | ||
* by the method instead. The `customizer` is bound to `thisArg` and invoked | ||
* with five arguments; (objectValue, sourceValue, key, object, source). | ||
* with five arguments: (objectValue, sourceValue, key, object, source). | ||
* | ||
@@ -207,0 +204,0 @@ * @static |
{ | ||
"name": "lodash.merge", | ||
"version": "3.0.3", | ||
"version": "3.1.0", | ||
"description": "The modern build of lodash’s `_.merge` as a module.", | ||
@@ -26,7 +26,9 @@ "homepage": "https://lodash.com/", | ||
"lodash.isarray": "^3.0.0", | ||
"lodash.isnative": "^3.0.0", | ||
"lodash.isplainobject": "^3.0.0", | ||
"lodash.istypedarray": "^3.0.0", | ||
"lodash.keys": "^3.0.0", | ||
"lodash.keysin": "^3.0.0", | ||
"lodash.toplainobject": "^3.0.0" | ||
} | ||
} |
@@ -1,2 +0,2 @@ | ||
# lodash.merge v3.0.3 | ||
# lodash.merge v3.1.0 | ||
@@ -20,2 +20,2 @@ The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) `_.merge` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module. | ||
See the [documentation](https://lodash.com/docs#merge) or [package source](https://github.com/lodash/lodash/blob/3.0.3-npm-packages/lodash.merge) for more details. | ||
See the [documentation](https://lodash.com/docs#merge) or [package source](https://github.com/lodash/lodash/blob/3.1.0-npm-packages/lodash.merge) for more details. |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
11127
12
225
+ Addedlodash.isnative@^3.0.0
+ Addedlodash.keysin@^3.0.0
+ Addedlodash.isnative@3.0.7(transitive)