From ae79414cfbedc7e630cdc5f3955bb49ee64c732e Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Mon, 1 Apr 2013 12:28:21 +0100
Subject: Simplify reading of paragraph properties

---
 lib/docx-reader.js         | 12 +++---------
 tests/docx-reader.tests.js |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/lib/docx-reader.js b/lib/docx-reader.js
index 2ab27bf..5cc13ae 100644
--- a/lib/docx-reader.js
+++ b/lib/docx-reader.js
@@ -54,11 +54,7 @@ function readXmlElement(element) {
 var xmlElementReaders = {
     "w:p": function(element) {
         var children = readXmlElements(element.children);
-        var properties;
-        var propertiesElement = _.find(children, isParagraphProperties);
-        if (propertiesElement) {
-            properties = propertiesElement.properties;
-        }
+        var properties = _.find(children, isParagraphProperties);
         
         return new documents.Paragraph(
             children.filter(negate(isParagraphProperties)),
@@ -67,6 +63,7 @@ var xmlElementReaders = {
     },
     "w:pPr": function(element) {
         var properties = {
+            type: "paragraphProperties"
         };
         
         var styleElement = element.first("w:pStyle");
@@ -74,10 +71,7 @@ var xmlElementReaders = {
             properties.styleName = styleElement.attributes["w:val"];
         }
         
-        return {
-            type: "paragraphProperties",
-            properties: properties
-        };
+        return properties;
     },
     "w:r": function(element) {
         var children = readXmlElements(element.children);
diff --git a/tests/docx-reader.tests.js b/tests/docx-reader.tests.js
index d22cd42..c4969be 100644
--- a/tests/docx-reader.tests.js
+++ b/tests/docx-reader.tests.js
@@ -33,7 +33,7 @@ describe("docx-reader", function() {
         });
         return docxReader.read(docxFile).then(function(result) {
             var paragraph = result.children[0];
-            assert.deepEqual({styleName: "Heading1"}, paragraph.properties);
+            assert.deepEqual("Heading1", paragraph.properties.styleName);
         });
     });
     
-- 
cgit v1.2.3