Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-12 20:07:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump to v4.1.2.

Browse Source
This commit is contained in:
John-David Dalton
2016-02-16 00:51:03 -08:00
parent afaae9f972
commit a862defba0
135 changed files with 2400 additions and 854 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lodash.mixin/index.js
View File

@@ -1,10 +1,10 @@
/**
* lodash 4.1.1 (Custom Build) <https://lodash.com/>
* lodash (Custom Build) <https://lodash.com/>
* Build: `lodash modularize exports="npm" -o ./`
* Copyright 2012-2016 The Dojo Foundation <http://dojofoundation.org/>
* Copyright jQuery Foundation and other contributors <https://jquery.org/>
* Released under MIT license <https://lodash.com/license>
* Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
* Copyright 2009-2016 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
* Available under MIT license <https://lodash.com/license>
* Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
*/
var keys = require('lodash.keys');
@@ -93,7 +93,7 @@ var objectToString = objectProto.toString;
* @private
* @param {Object} object The object to inspect.
* @param {Array} props The property names to filter.
* @returns {Array} Returns the new array of filtered property names.
* @returns {Array} Returns the function names.
*/
function baseFunctions(object, props) {
return arrayFilter(props, function(key) {
@@ -216,7 +216,7 @@ function mixin(object, source, options) {
var props = keys(source),
methodNames = baseFunctions(source, props);
var chain = (isObject(options) && 'chain' in options) ? options.chain : true,
var chain = !(isObject(options) && 'chain' in options) || !!options.chain,
isFunc = isFunction(object);
arrayEach(methodNames, function(methodName) {