From 54c5c0ee38eb915275be4b0713fcaafb56033ac3 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sat, 27 Apr 2013 16:54:42 +0100
Subject: Handle w:drawing elements with no children

---
 lib/document-xml-reader.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/document-xml-reader.js')

diff --git a/lib/document-xml-reader.js b/lib/document-xml-reader.js
index 04eec21..a391a21 100644
--- a/lib/document-xml-reader.js
+++ b/lib/document-xml-reader.js
@@ -23,7 +23,7 @@ function DocumentXmlReader(relationships, docxFile) {
 
     function readXmlElements(elements) {
         var results = elements.map(readXmlElement);
-        var values = _.pluck(results, "value").filter(notNull);
+        var values = _.flatten(_.pluck(results, "value"));
         var messages = _.flatten(_.pluck(results, "messages"), true);
         return new Result(values, messages);
     }
@@ -35,12 +35,12 @@ function DocumentXmlReader(relationships, docxFile) {
                 return handler(element);
             } else if (!Object.prototype.hasOwnProperty.call(ignoreElements, element.name)) {
                 return new Result(
-                    null,
+                    [],
                     [warning("An unrecognised element was ignored: " + element.name)]
                 );
             }
         }
-        return new Result(null);
+        return new Result([]);
     }
 
     var xmlElementReaders = {
@@ -105,7 +105,7 @@ function DocumentXmlReader(relationships, docxFile) {
         },
         
         "w:drawing": function(element) {
-            return readXmlElement(element.first("wp:inline"));
+            return readXmlElements(element.children);
         },
         "wp:inline": function(element) {
             var relationshipId = element
-- 
cgit v1.2.3