diff options
| -rw-r--r-- | lib/fs/mock.js | 2 | ||||
| -rw-r--r-- | lib/models/languages.js | 2 | ||||
| -rw-r--r-- | lib/output/ebook/onFinish.js | 7 | ||||
| -rw-r--r-- | lib/output/ebook/onPage.js | 2 | ||||
| -rw-r--r-- | package.json | 6 |
5 files changed, 10 insertions, 9 deletions
diff --git a/lib/fs/mock.js b/lib/fs/mock.js index 2149e1d..784c533 100644 --- a/lib/fs/mock.js +++ b/lib/fs/mock.js @@ -16,7 +16,7 @@ function createMockFS(files) { var mtime = new Date(); function getFile(filePath) { - var parts = path.normalize(filePath).split('/'); + var parts = path.normalize(filePath).split(path.sep); return parts.reduce(function(list, part, i) { if (!list) return null; diff --git a/lib/models/languages.js b/lib/models/languages.js index 1e58d88..42f05f9 100644 --- a/lib/models/languages.js +++ b/lib/models/languages.js @@ -57,7 +57,7 @@ Languages.createFromList = function(file, langs) { langs.forEach(function(lang) { lang = Language({ title: lang.title, - path: lang.path + path: lang.ref }); list = list.set(lang.getID(), lang); }); diff --git a/lib/output/ebook/onFinish.js b/lib/output/ebook/onFinish.js index 17a8e5e..f365bcb 100644 --- a/lib/output/ebook/onFinish.js +++ b/lib/output/ebook/onFinish.js @@ -9,6 +9,7 @@ var command = require('../../utils/command'); var writeFile = require('../helper/writeFile'); var getConvertOptions = require('./getConvertOptions'); +var SUMMARY_FILE = 'SUMMARY.html'; /** Write the SUMMARY.html @@ -20,12 +21,12 @@ function writeSummary(output) { var options = output.getOptions(); var prefix = options.get('prefix'); - var filePath = 'SUMMARY.html'; + var filePath = SUMMARY_FILE; var engine = WebsiteGenerator.createTemplateEngine(output, filePath); var context = JSONUtils.encodeOutput(output); // Render the theme - return Templating.renderFile(engine, prefix + '/SUMMARY.html', context) + return Templating.renderFile(engine, prefix + '/summary.html', context) // Write it to the disk .then(function(html) { @@ -53,7 +54,7 @@ function runEbookConvert(output) { .then(function(options) { var cmd = [ 'ebook-convert', - path.resolve(outputFolder, 'SUMMARY.html'), + path.resolve(outputFolder, SUMMARY_FILE), path.resolve(outputFolder, 'index.' + format), command.optionsToShellArgs(options) ].join(' '); diff --git a/lib/output/ebook/onPage.js b/lib/output/ebook/onPage.js index 21fd34c..b7b9b42 100644 --- a/lib/output/ebook/onPage.js +++ b/lib/output/ebook/onPage.js @@ -12,7 +12,7 @@ function onPage(output, page) { // Inline assets return Modifiers.modifyHTML(page, [ - Modifiers.inlineAssets(options.get('root')) + Modifiers.inlineAssets(options.get('root'), page.getFile().getPath()) ]) // Write page using website generator diff --git a/package.json b/package.json index 40528bf..96d3d2f 100644 --- a/package.json +++ b/package.json @@ -22,8 +22,8 @@ "extend": "^3.0.0", "fresh-require": "1.0.3", "front-matter": "2.0.7", - "gitbook-asciidoc": "1.1.1", - "gitbook-markdown": "1.2.2", + "gitbook-asciidoc": "1.1.4", + "gitbook-markdown": "1.2.3", "gitbook-plugin-fontsettings": "1.0.3", "gitbook-plugin-highlight": "2.0.2", "gitbook-plugin-livereload": "0.0.1", @@ -63,7 +63,7 @@ }, "devDependencies": { "eslint": "2.7.0", - "jest-cli": "^11.0.2" + "jest-cli": "12.0.2" }, "scripts": { "test": "node_modules/.bin/jest --bail", |