Fix list of files and parsing of navigation files only

1 files changed, 8 insertions, 7 deletions

diff --git a/lib/book.js b/lib/book.js
index 1236e5f..41b1d1a 100644
--- a/lib/book.js
+++ b/lib/book.js
@@ -33,6 +33,7 @@ var Book = function(root, options, parent) {
 
 	// Summary
 	this.summary = {};
+	this.navigation = [];
 
 	// Glossary
 	this.glossary = [];
@@ -85,19 +86,19 @@ Book.prototype.parse = function() {
 
 	.then(function() {
 		if (multilingal) return;
-		return that.parseReadme();
+		return that.listAllFiles();
 	})
 	.then(function() {
 		if (multilingal) return;
-		return that.parseSummary();
+		return that.parseReadme();
 	})
 	.then(function() {
 		if (multilingal) return;
-		return that.parseGlossary();
+		return that.parseSummary();
 	})
 	.then(function() {
 		if (multilingal) return;
-		return that.listAllFiles();
+		return that.parseGlossary();
 	})
 
 	.then(function() {
@@ -149,7 +150,7 @@ Book.prototype.generate = function(generator) {
 
                     if (file[file.length -1] == "/") {
                         return Q(generator.transferFolder(file));
-                    } else if (_.contains(parsers.extensions, path.extname(file)) && 1) {
+                    } else if (_.contains(parsers.extensions, path.extname(file)) && that.navigation[file]) {
                         return that.parsePage(file)
                         .then(function(content) {
 							return Q(generator.writeParsedFile(content, file));
@@ -269,6 +270,7 @@ Book.prototype.parseSummary = function() {
 	})
 	.then(function(summary) {
 		that.summary = summary;
+		that.navigation = parseNavigation(that.summary, that.files);
 	});
 };
 
@@ -307,8 +309,7 @@ Book.prototype.parsePage = function(filename) {
 		return filetype.parser.page(content);
 	})
 	.then(function(page) {
-		page.navigation = parseNavigation(that.summary, that.files);
-		page.progress = parseProgress(page.navigation, filename);
+		page.progress = parseProgress(that.navigation, filename);
 		return page;
 	});
 };