From 40fc65d1f2874eb707a4fb4e93c4a66ccd59f850 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Tue, 8 Jul 2014 10:20:52 +0100 Subject: Extract common code for image conversion --- lib/document-to-html.js | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'lib/document-to-html.js') diff --git a/lib/document-to-html.js b/lib/document-to-html.js index 9eef1f6..7e37255 100644 --- a/lib/document-to-html.js +++ b/lib/document-to-html.js @@ -4,6 +4,7 @@ var async = require("async"); var htmlPaths = require("./html-paths"); var HtmlGenerator = require("./html-generator").HtmlGenerator; var results = require("./results"); +var images = require("./images"); exports.DocumentConverter = DocumentConverter; @@ -121,17 +122,13 @@ function DocumentConversion(options) { } } - function defaultConvertImage(element, html, messages, callback) { - element.read("base64").then(function(imageBuffer) { - var src = "data:" + element.contentType + ";base64," + imageBuffer; - var attributes = {src: src}; - if (element.altText) { - attributes.alt = element.altText; - } - html.selfClosing(htmlPaths.element("img", attributes)); - callback(); - }).fail(callback); - } + var defaultConvertImage = images.inline(function(element) { + return element.read("base64").then(function(imageBuffer) { + return { + src: "data:" + element.contentType + ";base64," + imageBuffer + }; + }); + }); function footnoteUid(id) { return uniquifier + "-" + id; -- cgit v1.2.3