Labyricorn/liquidjs
1
0
Fork 0
mirror of https://github.com/harttle/liquidjs.git synced 2026-09-20 15:00:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

refactor: move file to token property

Browse Source
This commit is contained in:
harttle
2016-11-16 01:06:37 +08:00
parent 03b7ee95ed
commit 40bdd7e94a
4 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.js
+4 -8
View File
@@ -33,8 +33,8 @@ var _engine = {
return this;
},
parse: function(html) {
var tokens = tokenizer.parse(html);
parse: function(html, filepath) {
var tokens = tokenizer.parse(html, filepath);
return this.parser.parse(tokens);
},
render: function(tpl, ctx, opts) {
@@ -56,11 +56,7 @@ var _engine = {
renderFile: function(filepath, ctx, opts) {
opts = _.assign({}, opts);
return this.getTemplate(filepath, opts.root)
.then(templates => this.render(templates, ctx, opts))
.catch(e => {
e.file = filepath;
throw e;
});
.then(templates => this.render(templates, ctx, opts));
},
evalOutput: function(str, scope) {
var tpl = this.parser.parseOutput(str.trim());
@@ -100,7 +96,7 @@ var _engine = {
.then(str => this.parse(str))
.then(tpl => this.cache[filepath] = tpl);
} else {
return readFileAsync(filepath).then(str => this.parse(str));
return readFileAsync(filepath).then(str => this.parse(str, filepath));
}
});
},