From 310102bdac9a4258abc99447a7decd7024ca0667 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Tue, 22 Apr 2014 11:47:31 +0100 Subject: Pass options object into DocumentXmlReader --- lib/docx/document-xml-reader.js | 8 +++++++- lib/docx/docx-reader.js | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'lib') 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); }); }); -- cgit v1.2.3