Disable directoryIndex for ebook generation

3 files changed, 9 insertions, 4 deletions

diff --git a/lib/output/base.js b/lib/output/base.js
index 828a11e..cc4eb8d 100644
--- a/lib/output/base.js
+++ b/lib/output/base.js
@@ -19,7 +19,7 @@ function Output(book, opts) {
     _.bindAll(this);
 
     this.opts = _.defaults(opts || {}, {
-
+        directoryIndex: true
     });
 
     this.book = book;
@@ -222,7 +222,7 @@ Output.prototype.outputPath = function(filename, ext) {
 Output.prototype.outputUrl = function(filename, ext) {
     var href = this.outputPath(filename, ext);
 
-    if (path.basename(href) == 'index.html') {
+    if (path.basename(href) == 'index.html' && this.opts.directoryIndex) {
         href = path.dirname(href) + '/';
     }
 
diff --git a/lib/output/ebook.js b/lib/output/ebook.js
index ce83cef..6d531f8 100644
--- a/lib/output/ebook.js
+++ b/lib/output/ebook.js
@@ -10,6 +10,9 @@ var assetsInliner = require('./assets-inliner');
 
 function _EbookOutput() {
     WebsiteOutput.apply(this, arguments);
+
+    // ebook-convert does not support link like "./"
+    this.opts.directoryIndex = false;
 }
 util.inherits(_EbookOutput, WebsiteOutput);
 
diff --git a/lib/output/website.js b/lib/output/website.js
index 32647f6..01021e5 100644
--- a/lib/output/website.js
+++ b/lib/output/website.js
@@ -103,8 +103,10 @@ WebsiteOutput.prototype.prepare = function() {
 
         // Relase path to an asset
         that.env.addFilter('resolveAsset', function(href) {
-            href = path.join('/gitbook', href);
-            return that.resolveForPage(this.ctx.file.path, href);
+            href = path.join('gitbook', href);
+            if (!this.ctx.file) return href;
+
+            return that.resolveForPage(this.ctx.file.path, '/' + href);
         });
     })