diff options
| -rw-r--r-- | lib/template.js | 26 | ||||
| -rw-r--r-- | package.json | 2 |
2 files changed, 16 insertions, 12 deletions
diff --git a/lib/template.js b/lib/template.js index 29ce0a9..f1d9fc0 100644 --- a/lib/template.js +++ b/lib/template.js @@ -239,21 +239,25 @@ TemplateEngine.prototype.addBlock = function(name, block) { var args = Array.prototype.slice.call(arguments, 1); var callback = args.pop(); - // Extract blocks body - var _blocks = _.chain(block.blocks) - .reverse() - .map(function(blockName){ - return { - name: blockName, - body: args.pop()() - }; - }) - .reverse() - .value(); + // Extract blocks + var blocks = args + .concat([]) + .slice(-block.blocks.length); + + // Eliminate blocks from list + if (block.blocks.length > 0) args = args.slice(0, -block.blocks.length); + // Extract main body and kwargs var body = args.pop(); var kwargs = args.pop() || {}; + // Extract blocks body + var _blocks = _.map(block.blocks, function(blockName, i){ + return { + name: blockName, + body: blocks[i]() + }; + }); var func = that.bindContext(block.process); diff --git a/package.json b/package.json index 1076a5a..f3c4ae9 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "dependencies": { "q": "1.0.1", "lunr": "0.5.7", - "lodash": "2.4.1", + "lodash": "git+https://github.com/lodash/lodash.git#b0ff6f4c7b400da562b932f35de73209259585e1", "graceful-fs": "3.0.5", "resolve": "0.6.3", "fs-extra": "0.16.3", |