Extract readRunProperties function

1 files changed, 32 insertions, 26 deletions

diff --git a/lib/docx/document-xml-reader.js b/lib/docx/document-xml-reader.js
index 79e60f8..97241a7 100644
--- a/lib/docx/document-xml-reader.js
+++ b/lib/docx/document-xml-reader.js
@@ -62,6 +62,37 @@ function DocumentXmlReader(options) {
         return new Result([]);
     }
     
+    function readRunProperties(element) {
+        var properties = {
+            type: "runProperties"
+        };
+        
+        readRunStyle(properties, element);
+        
+        var verticalAlignmentElement = element.first("w:vertAlign");
+        if (verticalAlignmentElement) {
+            properties.verticalAlignment = verticalAlignmentElement.attributes["w:val"];
+        }
+        
+        properties.isBold = !!element.first("w:b");
+        properties.isUnderline = !!element.first("w:u");
+        properties.isItalic = !!element.first("w:i");
+        
+        return new Result(properties);
+    }
+    
+    function readRunStyle(properties, element) {
+        var styleElement = element.first("w:rStyle");
+        if (styleElement) {
+            var styleId = styleElement.attributes["w:val"];
+            properties.styleId = styleId;
+            if (styleId) {
+                var style = styles.findCharacterStyleById(styleId);
+                properties.styleName = style.name;
+            }
+        }
+    }
+    
     function readChildElements(element) {
         return readXmlElements(element.children);
     }
@@ -116,32 +147,7 @@ function DocumentXmlReader(options) {
                     );
                 });
         },
-        "w:rPr": function(element) {
-            var properties = {
-                type: "runProperties"
-            };
-            
-            var styleElement = element.first("w:rStyle");
-            if (styleElement) {
-                var styleId = styleElement.attributes["w:val"];
-                properties.styleId = styleId;
-                if (styleId) {
-                    var style = styles.findCharacterStyleById(styleId);
-                    properties.styleName = style.name;
-                }
-            }
-            
-            var verticalAlignmentElement = element.first("w:vertAlign");
-            if (verticalAlignmentElement) {
-                properties.verticalAlignment = verticalAlignmentElement.attributes["w:val"];
-            }
-            
-            properties.isBold = !!element.first("w:b");
-            properties.isUnderline = !!element.first("w:u");
-            properties.isItalic = !!element.first("w:i");
-            
-            return new Result(properties);
-        },
+        "w:rPr": readRunProperties,
         "w:t": function(element) {
             return new Result(new documents.Text(element.text()));
         },