Skip to content

Commit f6b3b0e

Browse files
committed
Merge branch 'master' of https://github.com/Fen1kz/consolidate.js into Fen1kz-master
2 parents 9e096bf + bf64aa7 commit f6b3b0e

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

History.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
* add plates support
55
* add teacup support
6+
* allow absolute and relative partial paths
7+
* extend dot options
68

79
0.14.0 / 2016-01-24
810
===================

lib/consolidate.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1041,8 +1041,12 @@ exports.dot = fromStringRenderer('dot');
10411041
exports.dot.render = function (str, options, fn) {
10421042
return promisify(fn, function (fn) {
10431043
var engine = requires.dot || (requires.dot = require('dot'));
1044+
var extend = (requires.extend || (requires.extend = require('util')._extend));
10441045
try {
1045-
var tmpl = cache(options) || cache(options, engine.compile(str, options && options._def));
1046+
var settings = {};
1047+
settings = extend(settings, engine.templateSettings);
1048+
settings = extend(settings, options ? options.dot : {});
1049+
var tmpl = cache(options) || cache(options, engine.template(str, settings, options));
10461050
fn(null, tmpl(options));
10471051
} catch (err) {
10481052
fn(err);

0 commit comments

Comments
 (0)