diff options
| author | codepiano <codepiano.li@gmail.com> | 2014-11-02 01:34:28 +0800 |
|---|---|---|
| committer | codepiano <codepiano.li@gmail.com> | 2014-11-02 01:34:28 +0800 |
| commit | 1502d65286eb36a76b8d0016f7bad64b9bf9f39f (patch) | |
| tree | f954a62a351413faef03818b49d92a6312d5e4df /lib/generate/site/index.js | |
| parent | 9da10e2b25cb8ad919bb8563cfdc81d9e0612341 (diff) | |
| parent | 0feb672d708e2d73ee159d5a94b614f90c85e9e2 (diff) | |
| download | gitbook-1502d65286eb36a76b8d0016f7bad64b9bf9f39f.zip gitbook-1502d65286eb36a76b8d0016f7bad64b9bf9f39f.tar.gz gitbook-1502d65286eb36a76b8d0016f7bad64b9bf9f39f.tar.bz2 | |
Merge branch 'master' of github.com:GitbookIO/gitbook into fork
Conflicts:
lib/parse/page.js
Diffstat (limited to 'lib/generate/site/index.js')
| -rw-r--r-- | lib/generate/site/index.js | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/generate/site/index.js b/lib/generate/site/index.js index 8190381..47d09f2 100644 --- a/lib/generate/site/index.js +++ b/lib/generate/site/index.js @@ -123,12 +123,15 @@ Generator.prototype.prepareFile = function(content, _input) { return parse.page(page, { // Local files path dir: path.dirname(_input) || '/', - // Project's include folder - includes_dir: path.join(that.options.input, '_includes'), + // Output directory outdir: path.dirname(_input) || '/', - // Templating variables - variables: that.options.variables, + + // Includer for templating + includer: parse.includer(that.options.variables, [ + path.dirname(_input) || '/', + path.join(that.options.input, '_includes'), + ], path.join, fs.readFileSync) }); }) .then(function(sections) { |