summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSamy Pesse <samypesse@gmail.com>2016-05-26 21:38:27 +0200
committerSamy Pesse <samypesse@gmail.com>2016-05-26 21:38:27 +0200
commit09b3618da88ce9cdde948e0511ef95886e24d676 (patch)
tree7a554ad261c7fe57775d3bca6449a6481584fd20 /lib
parent901328f247388198fff77f411377206222c89390 (diff)
downloadgitbook-09b3618da88ce9cdde948e0511ef95886e24d676.zip
gitbook-09b3618da88ce9cdde948e0511ef95886e24d676.tar.gz
gitbook-09b3618da88ce9cdde948e0511ef95886e24d676.tar.bz2
Annotate glossary terms before resolving links
Diffstat (limited to 'lib')
-rw-r--r--lib/output/__tests__/website.js2
-rw-r--r--lib/output/getModifiers.js12
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/output/__tests__/website.js b/lib/output/__tests__/website.js
index 2c7ff58..0415fbb 100644
--- a/lib/output/__tests__/website.js
+++ b/lib/output/__tests__/website.js
@@ -13,7 +13,7 @@ describe('WebsiteGenerator', function() {
});
});
- describe.only('Glossary', function() {
+ describe('Glossary', function() {
var folder;
before(function() {
diff --git a/lib/output/getModifiers.js b/lib/output/getModifiers.js
index 4dbeb2e..66fbc1a 100644
--- a/lib/output/getModifiers.js
+++ b/lib/output/getModifiers.js
@@ -39,18 +39,18 @@ function getModifiers(output, page) {
// Normalize IDs on headings
Modifiers.addHeadingId,
+ // Annotate text with glossary entries
+ Modifiers.annotateText.bind(null, entries, glossaryFilename),
+
+ // Resolve images
+ Modifiers.resolveImages.bind(null, currentFilePath),
+
// Resolve links (.md -> .html)
Modifiers.resolveLinks.bind(null,
currentFilePath,
resolveFileToURL.bind(null, output)
),
- // Resolve images
- Modifiers.resolveImages.bind(null, currentFilePath),
-
- // Annotate text with glossary entries
- Modifiers.annotateText.bind(null, entries, glossaryFilename),
-
// Highlight code blocks using "code" block
Modifiers.highlightCode.bind(null, function(lang, source) {
return Promise(code.applyBlock({