mirror of
https://github.com/whoisclebs/lodash.git
synced 2026-02-07 10:07:48 +00:00
Bump to v3.0.2.
This commit is contained in:
committed by
John-David Dalton
parent
60b8329a73
commit
e2db58867b
@@ -1,4 +1,4 @@
|
||||
# lodash.mixin v3.0.1
|
||||
# lodash.mixin v3.0.2
|
||||
|
||||
The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) `_.mixin` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
|
||||
|
||||
@@ -17,4 +17,4 @@ In Node.js/io.js:
|
||||
var mixin = require('lodash.mixin');
|
||||
```
|
||||
|
||||
See the [documentation](https://lodash.com/docs#mixin) or [package source](https://github.com/lodash/lodash/blob/3.0.1-npm-packages/lodash.mixin) for more details.
|
||||
See the [documentation](https://lodash.com/docs#mixin) or [package source](https://github.com/lodash/lodash/blob/3.0.2-npm-packages/lodash.mixin) for more details.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/**
|
||||
* lodash 3.0.1 (Custom Build) <https://lodash.com/>
|
||||
* lodash 3.0.2 (Custom Build) <https://lodash.com/>
|
||||
* Build: `lodash modern modularize exports="npm" -o ./`
|
||||
* Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
|
||||
* Based on Underscore.js 1.8.2 <http://underscorejs.org/LICENSE>
|
||||
@@ -18,11 +18,9 @@ var arrayProto = Array.prototype;
|
||||
var push = arrayProto.push;
|
||||
|
||||
/**
|
||||
* 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
|
||||
* @memberOf _
|
||||
* @category Lang
|
||||
@@ -43,7 +41,7 @@ function isObject(value) {
|
||||
// Avoid a V8 JIT bug in Chrome 19-20.
|
||||
// See https://code.google.com/p/v8/issues/detail?id=2291 for more details.
|
||||
var type = typeof value;
|
||||
return type == 'function' || (value && type == 'object') || false;
|
||||
return type == 'function' || (!!value && type == 'object');
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -51,10 +49,13 @@ function isObject(value) {
|
||||
* destination object. If `object` is a function then methods are added to
|
||||
* its prototype as well.
|
||||
*
|
||||
* **Note:** Use `_.runInContext` to create a pristine `lodash` function to
|
||||
* avoid conflicts caused by modifying the original.
|
||||
*
|
||||
* @static
|
||||
* @memberOf _
|
||||
* @category Utility
|
||||
* @param {Function|Object} [object=this] object The destination object.
|
||||
* @param {Function|Object} [object=lodash] The destination object.
|
||||
* @param {Object} source The object of functions to add.
|
||||
* @param {Object} [options] The options object.
|
||||
* @param {boolean} [options.chain=true] Specify whether the functions added
|
||||
@@ -68,7 +69,7 @@ function isObject(value) {
|
||||
* });
|
||||
* }
|
||||
*
|
||||
* // use `_.runInContext` to avoid potential conflicts (esp. in Node.js)
|
||||
* // use `_.runInContext` to avoid conflicts (esp. in Node.js)
|
||||
* var _ = require('lodash').runInContext();
|
||||
*
|
||||
* _.mixin({ 'vowels': vowels });
|
||||
@@ -105,12 +106,10 @@ function mixin(object, source, options) {
|
||||
return function() {
|
||||
var chainAll = this.__chain__;
|
||||
if (chain || chainAll) {
|
||||
var result = object(this.__wrapped__);
|
||||
(result.__actions__ = arrayCopy(this.__actions__)).push({
|
||||
'func': func,
|
||||
'args': arguments,
|
||||
'thisArg': object
|
||||
});
|
||||
var result = object(this.__wrapped__),
|
||||
actions = result.__actions__ = arrayCopy(this.__actions__);
|
||||
|
||||
actions.push({ 'func': func, 'args': arguments, 'thisArg': object });
|
||||
result.__chain__ = chainAll;
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "lodash.mixin",
|
||||
"version": "3.0.1",
|
||||
"version": "3.0.2",
|
||||
"description": "The modern build of lodash’s `_.mixin` as a module.",
|
||||
"homepage": "https://lodash.com/",
|
||||
"icon": "https://lodash.com/icon.svg",
|
||||
|
||||
Reference in New Issue
Block a user