AtHeartEngineer/ejs
1
0
Fork 0
mirror of https://github.com/CryptKeeperZK/ejs.git synced 2026-01-10 07:58:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

revert 8aaa1205cf use only one __output array for template and includes

Browse Source
This commit is contained in:
m
2017-07-28 23:43:36 +01:00
parent 5f255ce11f
commit bcbcd8fcac
1 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/ejs.js
View File

@@ -507,20 +507,12 @@ Template.prototype = {
if (!this.source) {
this.generateSource();
if (opts.client) {
prepended += 'var __output = [], __append = callerAppend || __output.push.bind(__output);' + '\n';
}
else {
prepended += 'var __append = callerAppend;' + '\n';
}
prepended += ' var __output = [], __append = __output.push.bind(__output);' + '\n';
if (opts._with !== false) {
prepended += ' with (' + opts.localsName + ' || {}) {' + '\n';
appended += ' }' + '\n';
}
if (opts.client) {
appended += ' if (! callerAppend) { return __output.join("");} ' + '\n';
}
appended += ' return __output.join("");' + '\n';
this.source = prepended + this.source + appended;
}
@@ -554,7 +546,7 @@ Template.prototype = {
}
try {
fn = new Function(opts.localsName + ', escapeFn, include, rethrow, callerAppend', src);
fn = new Function(opts.localsName + ', escapeFn, include, rethrow', src);
}
catch(e) {
// istanbul ignore else
@@ -577,22 +569,15 @@ Template.prototype = {
// Return a callable function which will execute the function
// created by the source-code, with the passed data as locals
// Adds a local `include` function which allows full recursive include
var returnedFn = function (data, callerAppend) {
var __output;
var __append = callerAppend;
if (! callerAppend) {
__output = [];
__append = __output.push.bind(__output);
}
var returnedFn = function (data) {
var include = function (path, includeData) {
var d = utils.shallowCopy({}, data);
if (includeData) {
d = utils.shallowCopy(d, includeData);
}
return includeFile(path, opts)(d, __append);
return includeFile(path, opts)(d);
};
fn.apply(opts.context, [data || {}, escapeFn, include, rethrow, __append]);
if (! callerAppend) { return __output.join(''); }
return fn.apply(opts.context, [data || {}, escapeFn, include, rethrow]);
};
returnedFn.dependencies = this.dependencies;
return returnedFn;