diff options
author | Samy Pessé <samypesse@gmail.com> | 2014-06-06 18:37:35 +0200 |
---|---|---|
committer | Samy Pessé <samypesse@gmail.com> | 2014-06-06 18:37:35 +0200 |
commit | cfebdc6f6b0967266a0aa8b5a82d5d5761cba916 (patch) | |
tree | 3122546fac837dca0527405149cf6512af95317a | |
parent | 65319e8fd68de6945eda8f9de4bbd4ed58edaf55 (diff) | |
download | gitbook-cfebdc6f6b0967266a0aa8b5a82d5d5761cba916.zip gitbook-cfebdc6f6b0967266a0aa8b5a82d5d5761cba916.tar.gz gitbook-cfebdc6f6b0967266a0aa8b5a82d5d5761cba916.tar.bz2 |
Fix #296: fix static links on windows
-rw-r--r-- | lib/generate/site/index.js | 4 | ||||
-rw-r--r-- | lib/utils/links.js | 15 |
2 files changed, 16 insertions, 3 deletions
diff --git a/lib/generate/site/index.js b/lib/generate/site/index.js index 7146e8e..abbb9f0 100644 --- a/lib/generate/site/index.js +++ b/lib/generate/site/index.js @@ -7,7 +7,7 @@ var swig = require('swig'); var fs = require("../fs"); var parse = require("../../parse"); var BaseGenerator = require("../generator"); - +var links = require("../../utils/links"); var indexer = require('./search_indexer'); var Manifest = require('../manifest'); @@ -162,7 +162,7 @@ Generator.prototype.convertFile = function(content, _input) { content: page.sections, basePath: basePath, - staticBase: path.join(basePath, "gitbook"), + staticBase: links.join(basePath, "gitbook"), }, output, function(html) { page.content = html; diff --git a/lib/utils/links.js b/lib/utils/links.js index 808d711..c965dd9 100644 --- a/lib/utils/links.js +++ b/lib/utils/links.js @@ -26,8 +26,21 @@ var toAbsolute = function(_href, dir, outdir) { return _href; }; +// Join links + +var join = function() { + var _href = path.join.apply(path, arguments); + + if (process.platform === 'win32') { + _href = _href.replace(/\\/g, '/'); + } + + return _href; +}; + module.exports = { isRelative: isRelative, - toAbsolute: toAbsolute + toAbsolute: toAbsolute, + join: join };
\ No newline at end of file |