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

Minor source tweak of _.template.

Browse Source
This commit is contained in:
John-David Dalton
2014-09-22 10:53:33 -07:00
parent 277d91afce
commit 41f1fb8d95
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lodash.js
View File

@@ -8473,12 +8473,13 @@
// http://ejohn.org/blog/javascript-micro-templating/ // http://ejohn.org/blog/javascript-micro-templating/
// and Laura Doktorova's doT.js // and Laura Doktorova's doT.js
// https://github.com/olado/doT // https://github.com/olado/doT
var settings = lodash.templateSettings;
if (isIterateeCall(string, options, otherOptions)) { if (isIterateeCall(string, options, otherOptions)) {
options = otherOptions = null; options = otherOptions = null;
} }
var settings = lodash.templateSettings;
options = assign({}, otherOptions || options, settings, assignOwnDefaults);
string = String(string == null ? '' : string); string = String(string == null ? '' : string);
options = assign({}, otherOptions || options, settings, assignOwnDefaults);
var imports = assign({}, options.imports, settings.imports, assignOwnDefaults), var imports = assign({}, options.imports, settings.imports, assignOwnDefaults),
importsKeys = keys(imports), importsKeys = keys(imports),