From 29bd09bbe3e1a37fba42496b43453288884ef2d8 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Mon, 1 Apr 2013 16:32:07 +0100
Subject: Display messages in web interface

---
 lib/docx-reader.js | 5 +++--
 lib/web.js         | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'lib')

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);
     });
 };
 
diff --git a/lib/web.js b/lib/web.js
index 33d28f3..9d77707 100644
--- a/lib/web.js
+++ b/lib/web.js
@@ -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();
-- 
cgit v1.2.3