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/parse/page.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/parse/page.js')
| -rw-r--r-- | lib/parse/page.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/parse/page.js b/lib/parse/page.js index e4d9c46..2cbbbf4 100644 --- a/lib/parse/page.js +++ b/lib/parse/page.js @@ -51,7 +51,7 @@ function parsePage(page, options) { options = options || {}; // Lex if not already lexed - page.lexed = (_.isArray(page.content) ? page.content : lex(include(page.content, [options.dir, options.includes_dir], options.variables))) + page.lexed = (_.isArray(page.content) ? page.content : lex(include(page.content, options.includer || function() { return undefined; }))) return page.lexed .map(function(section) { // Transform given type |