aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2014-04-22 11:47:31 +0100
committerMichael Williamson <mike@zwobble.org>2014-04-22 11:47:31 +0100
commit310102bdac9a4258abc99447a7decd7024ca0667 (patch)
treeafd84568661f3026cbcc817b721082b5230bb924 /lib
parentc33d575f33591f0b7b2e838b5dc21b6b0cc3a457 (diff)
Pass options object into DocumentXmlReader
Diffstat (limited to 'lib')
-rw-r--r--lib/docx/document-xml-reader.js8
-rw-r--r--lib/docx/docx-reader.js7
2 files changed, 13 insertions, 2 deletions
diff --git a/lib/docx/document-xml-reader.js b/lib/docx/document-xml-reader.js
index 15a2dae..fc4b630 100644
--- a/lib/docx/document-xml-reader.js
+++ b/lib/docx/document-xml-reader.js
@@ -8,7 +8,13 @@ var Result = require("../results").Result;
var warning = require("../results").warning;
-function DocumentXmlReader(relationships, contentTypes, docxFile, numbering) {
+function DocumentXmlReader(options) {
+ var relationships = options.relationships;
+ var contentTypes = options.contentTypes;
+ var docxFile = options.docxFile;
+ var numbering = options.numbering;
+
+
function convertXmlToDocument(documentXml) {
var body = documentXml.root.first("w:body");
diff --git a/lib/docx/docx-reader.js b/lib/docx/docx-reader.js
index 82a647c..20c4834 100644
--- a/lib/docx/docx-reader.js
+++ b/lib/docx/docx-reader.js
@@ -20,7 +20,12 @@ function read(options) {
readNumberingFromZipFile(docxFile),
readXmlFromZipFile(docxFile, "word/document.xml")
]).spread(function(relationships, contentTypes, numbering, documentXml) {
- var reader = new DocumentXmlReader(relationships, contentTypes, docxFile, numbering);
+ var reader = new DocumentXmlReader({
+ relationships: relationships,
+ contentTypes: contentTypes,
+ docxFile: docxFile,
+ numbering: numbering
+ });
return reader.convertXmlToDocument(documentXml);
});
});