Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-06 09:47:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump to v4.17.3.

Browse Source
This commit is contained in:
John-David Dalton
2016-12-19 17:41:46 -06:00
parent db9697dfef
commit b93c3b1ee8
33 changed files with 372 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
template.js
View File

@@ -1,7 +1,7 @@
var assignInDefaults = require('./_assignInDefaults'),
assignInWith = require('./assignInWith'),
var assignInWith = require('./assignInWith'),
attempt = require('./attempt'),
baseValues = require('./_baseValues'),
customDefaultsAssignIn = require('./_customDefaultsAssignIn'),
escapeStringChar = require('./_escapeStringChar'),
isError = require('./isError'),
isIterateeCall = require('./_isIterateeCall'),
@@ -141,9 +141,9 @@ function template(string, options, guard) {
options = undefined;
}
string = toString(string);
options = assignInWith({}, options, settings, assignInDefaults);
options = assignInWith({}, options, settings, customDefaultsAssignIn);
var imports = assignInWith({}, options.imports, settings.imports, assignInDefaults),
var imports = assignInWith({}, options.imports, settings.imports, customDefaultsAssignIn),
importsKeys = keys(imports),
importsValues = baseValues(imports, importsKeys);