refactor: use _.assign

This commit is contained in:
harttle
2016-11-03 01:01:36 +08:00
parent f70b2ee203
commit c100a2e25e
3 changed files with 21 additions and 8 deletions
+9 -6
View File
@@ -38,9 +38,11 @@ var _engine = {
return this.parser.parse(tokens);
},
render: function(tpl, ctx, opts) {
opts = opts || {};
opts.strict_variables = opts.strict_variables || false;
opts.strict_filters = opts.strict_filters || false;
opts = _.assign({
strict_variables: false,
strict_filters: false,
root: []
}, opts);
this.renderer.initRegister(opts);
var scope = Scope.factory(ctx, {
strict: opts.strict_variables,
@@ -59,7 +61,7 @@ var _engine = {
});
},
renderFile: function(filepath, ctx, opts) {
opts = opts || {};
opts = _.assign({}, opts);
return this.getTemplate(filepath, opts.root)
.then(templates => this.render(templates, ctx, opts))
.catch(e => {
@@ -122,7 +124,7 @@ var _engine = {
};
function factory(options) {
options = options || {};
options = _.assign({}, options);
options.root = normalizeStringArray(options.root);
if (!options.root.length) options.root = ['.'];
@@ -148,7 +150,8 @@ factory.evalValue = Syntax.evalValue;
factory.Types = {
ParseError: Errors.ParseError,
TokenizationEroor: Errors.TokenizationError,
RenderBreak: Errors.RenderBreak
RenderBreak: Errors.RenderBreak,
AssertionError: Errors.AssertionError
};
module.exports = factory;
+3 -2
View File
@@ -148,8 +148,9 @@ function matchRightBracket(str, begin) {
}
exports.factory = function(_ctx, opts) {
opts = opts || {};
opts.strict = opts.strict || false;
opts = _.assign({
strict: false
}, opts);
var scope = Object.create(Scope);
scope.opts = opts;
+9
View File
@@ -25,6 +25,14 @@ function forOwn(object, iteratee) {
return object;
}
function assign(dst, src) {
dst = dst || {};
forOwn(src, function(v, k) {
dst[k] = v;
});
return dst;
}
function isArray(value) {
return value instanceof Array;
}
@@ -32,3 +40,4 @@ function isArray(value) {
exports.isString = isString;
exports.isArray = isArray;
exports.forOwn = forOwn;
exports.assign = assign;