summaryrefslogtreecommitdiffstats
path: root/lib/output/modifiers/inlineAssets.js
diff options
context:
space:
mode:
authorSamy Pesse <samypesse@gmail.com>2016-04-27 22:36:59 +0200
committerSamy Pesse <samypesse@gmail.com>2016-04-27 22:36:59 +0200
commit139e487998a620af06837ab75396be3e169b00c0 (patch)
treeb16fe14fdf8bc82f81aba6957937c79efca2189e /lib/output/modifiers/inlineAssets.js
parent9bb0a3fbd355b6dda2fe33e3a83884baa8f30917 (diff)
downloadgitbook-139e487998a620af06837ab75396be3e169b00c0.zip
gitbook-139e487998a620af06837ab75396be3e169b00c0.tar.gz
gitbook-139e487998a620af06837ab75396be3e169b00c0.tar.bz2
Correctly resolve images starting with /
Diffstat (limited to 'lib/output/modifiers/inlineAssets.js')
-rw-r--r--lib/output/modifiers/inlineAssets.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/output/modifiers/inlineAssets.js b/lib/output/modifiers/inlineAssets.js
index 4106d69..9f19fd7 100644
--- a/lib/output/modifiers/inlineAssets.js
+++ b/lib/output/modifiers/inlineAssets.js
@@ -1,5 +1,6 @@
var svgToImg = require('./svgToImg');
var svgToPng = require('./svgToPng');
+var resolveImages = require('./resolveImages');
var fetchRemoteImages = require('./fetchRemoteImages');
var Promise = require('../../utils/promise');
@@ -12,7 +13,12 @@ var Promise = require('../../utils/promise');
function inlineAssets(rootFolder, currentFile) {
return function($) {
return Promise()
+
+ // Resolving images and fetching external images should be
+ // done before svg conversion
+ .then(resolveImages.bind(null, currentFile))
.then(fetchRemoteImages.bind(null, rootFolder, currentFile))
+
.then(svgToImg.bind(null, rootFolder, currentFile))
.then(svgToPng.bind(null, rootFolder, currentFile));
};