diff options
| -rw-r--r-- | lib/docx-reader.js | 5 | ||||
| -rw-r--r-- | lib/web.js | 3 | ||||
| -rw-r--r-- | templates/convert.html | 7 |
3 files changed, 12 insertions, 3 deletions
diff --git a/lib/docx-reader.js b/lib/docx-reader.js index e01d253..01d558b 100644 --- a/lib/docx-reader.js +++ b/lib/docx-reader.js @@ -41,7 +41,7 @@ function convertXmlToDocument(documentXml) { function readXmlElements(elements) { var results = elements.map(readXmlElement); var values = _.pluck(results, "value").filter(notNull); - var messages = _.pluck(results, "messages"); + var messages = _.flatten(_.pluck(results, "messages"), true); return new Result(values, messages); } @@ -147,8 +147,9 @@ Result.prototype.map = function(func) { }; Result.prototype.mapThen = function(func) { + var messages = this.messages; return func(this.value).then(function(resultValue) { - return new Result(resultValue, this.messages); + return new Result(resultValue, messages); }); }; @@ -63,7 +63,8 @@ function handleConvert(request, response, next) { name: "convert.html", values: { documentName: uploadedDocument.name, - documentHtml: result.html + documentHtml: result.html, + messages: result.messages } }; next(); diff --git a/templates/convert.html b/templates/convert.html index 5589bc2..39d77d7 100644 --- a/templates/convert.html +++ b/templates/convert.html @@ -8,6 +8,13 @@ </div> <div class="span6"> <p>Uploaded document:<br /> <strong>{documentName}</strong></p> + + <ul> + {#messages} + <li class="{type}">{message}</li> + {/messages} + </ul> + </div> </div> |