summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamy Pessé <samypesse@gmail.com>2016-06-06 12:18:06 +0200
committerSamy Pessé <samypesse@gmail.com>2016-06-06 12:18:06 +0200
commitc38e67ea61e4824601049184b39c7e5639987d09 (patch)
tree585a26484fd7f825cf41549dcc2db14bf620ce2a
parent97a5f8805efcd145377b0c05cb14a6f87d2cd615 (diff)
parent421fef6ebf865469030c044461d02b34e1ae05dc (diff)
downloadgitbook-c38e67ea61e4824601049184b39c7e5639987d09.zip
gitbook-c38e67ea61e4824601049184b39c7e5639987d09.tar.gz
gitbook-c38e67ea61e4824601049184b39c7e5639987d09.tar.bz2
Merge pull request #1344 from GitbookIO/fix/readme-in-summary
Search for README file in whole summary before inserting as first article
-rw-r--r--lib/parse/parseSummary.js8
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/parse/parseSummary.js b/lib/parse/parseSummary.js
index 72bf224..2c1e3b3 100644
--- a/lib/parse/parseSummary.js
+++ b/lib/parse/parseSummary.js
@@ -1,7 +1,6 @@
var parseStructureFile = require('./parseStructureFile');
var Summary = require('../models/summary');
var SummaryModifier = require('../modifiers').Summary;
-var location = require('../utils/location');
/**
Parse summary in a book, the summary can only be parsed
@@ -27,11 +26,10 @@ function parseSummary(book) {
summary = Summary.createFromParts(file, result.parts);
}
- // Insert readme as first entry
- var firstArticle = summary.getFirstArticle();
+ // Insert readme as first entry if not in SUMMARY.md
+ var readmeArticle = summary.getByPath(readmeFile.getPath());
- if (readmeFile.exists() &&
- (!firstArticle || !location.areIdenticalPaths(firstArticle.getRef(), readmeFile.getPath()))) {
+ if (readmeFile.exists() && !readmeArticle) {
summary = SummaryModifier.unshiftArticle(summary, {
title: 'Introduction',
ref: readmeFile.getPath()