diff options
| -rw-r--r-- | lib/utils/links.js | 2 | ||||
| -rw-r--r-- | lib/utils/page.js | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/utils/links.js b/lib/utils/links.js index e607c94..9fe6127 100644 --- a/lib/utils/links.js +++ b/lib/utils/links.js @@ -15,7 +15,7 @@ var isRelative = function(href) { try { var parsed = url.parse(href); - return !parsed.protocol && parsed.path && parsed.path[0] != '/'; + return !!(!parsed.protocol && parsed.path);// && parsed.path[0] != '/'; } catch(err) {} return true; diff --git a/lib/utils/page.js b/lib/utils/page.js index 483fdfd..8cb8eb9 100644 --- a/lib/utils/page.js +++ b/lib/utils/page.js @@ -154,7 +154,7 @@ function normalizeHtml(src, options) { function convertImages(images, options) { return _.reduce(images, function(prev, image) { return prev.then(function() { - var imgin = links. isExternal(image.source)? image.source : path.resolve(options.book.root, image.source); + var imgin = links. isExternal(image.source)? image.source : path.resolve(options.book.options.output, image.source); var imgout = path.resolve(options.book.options.output, image.dest); options.book.log.debug("convert image", image.source, "to", image.dest, "..."); @@ -210,6 +210,8 @@ function normalizePage(sections, options) { return Q() .then(function() { + toConvert = _.uniq(toConvert, 'source'); + return convertImages(toConvert, options); }) .thenResolve(sections); |