summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamy Pessé <samypesse@gmail.com>2016-05-12 15:48:02 +0200
committerSamy Pessé <samypesse@gmail.com>2016-05-12 15:48:02 +0200
commit08d780d1f63a96ee26386d92e38f3b764ccda37e (patch)
treed10a7c4466018f4345f44089cd66cf3198111592
parent2e74fafa36c35c11148c09d4745402f23c53c1f8 (diff)
downloadgitbook-08d780d1f63a96ee26386d92e38f3b764ccda37e.zip
gitbook-08d780d1f63a96ee26386d92e38f3b764ccda37e.tar.gz
gitbook-08d780d1f63a96ee26386d92e38f3b764ccda37e.tar.bz2
Fix #1300: parse page frontmatter and content when listing pages
-rw-r--r--lib/output/generatePage.js2
-rw-r--r--lib/parse/parsePagesList.js10
2 files changed, 7 insertions, 5 deletions
diff --git a/lib/output/generatePage.js b/lib/output/generatePage.js
index 5b0d4f6..44c98b9 100644
--- a/lib/output/generatePage.js
+++ b/lib/output/generatePage.js
@@ -23,7 +23,7 @@ function generatePage(output, page) {
return timing.measure(
'page.generate',
- Parse.parsePage(book, page)
+ Promise(page)
.then(function(resultPage) {
var file = resultPage.getFile();
var filePath = file.getPath();
diff --git a/lib/parse/parsePagesList.js b/lib/parse/parsePagesList.js
index a3a52f8..8644fa1 100644
--- a/lib/parse/parsePagesList.js
+++ b/lib/parse/parsePagesList.js
@@ -3,6 +3,7 @@ var Immutable = require('immutable');
var timing = require('../utils/timing');
var Page = require('../models/page');
var walkSummary = require('./walkSummary');
+var parsePage = require('./parsePage');
/**
Parse all pages from a book as an OrderedMap
@@ -27,10 +28,11 @@ function parsePagesList(book) {
return fs.statFile(filepath)
.then(function(file) {
- map = map.set(
- filepath,
- Page.createForFile(file)
- );
+ var page = Page.createForFile(file);
+ return parsePage(book, page);
+ })
+ .then(function(page) {
+ map = map.set(filepath, page);
}, function() {
// file doesn't exist
});