aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2013-04-01 15:52:24 +0100
committerMichael Williamson <mike@zwobble.org>2013-04-01 15:52:24 +0100
commite5a8d1bcce3a611bd3cd266ef36431a0c444fdde (patch)
tree412d92f84201b6f26fd290c88a57ac38f5dced5d
parent7aecbe20f174100cdc6f72238f43ef3d96e7fb50 (diff)
Alias result value to result.document
-rw-r--r--lib/docx-reader.js4
-rw-r--r--lib/index.js2
-rw-r--r--tests/docx-reader.tests.js6
3 files changed, 7 insertions, 5 deletions
diff --git a/lib/docx-reader.js b/lib/docx-reader.js
index 94e5f99..b1e5627 100644
--- a/lib/docx-reader.js
+++ b/lib/docx-reader.js
@@ -30,10 +30,12 @@ function read(docxFile) {
function convertXmlToDocument(documentXml) {
var body = documentXml.root.first("w:body");
- return readXmlElements(body.children)
+ var result = readXmlElements(body.children)
.map(function(children) {
return new documents.Document(children);
});
+ result.document = result.value;
+ return result;
}
function readXmlElements(elements) {
diff --git a/lib/index.js b/lib/index.js
index 2a5283f..83f1572 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -20,6 +20,6 @@ Converter.prototype.convertToHtml = function(docxFile) {
var documentConverter = this._documentConverter;
return docxReader.read(docxFile)
.then(function(result) {
- return documentConverter.convertToHtml(result.value);
+ return documentConverter.convertToHtml(result.document);
});
}
diff --git a/tests/docx-reader.tests.js b/tests/docx-reader.tests.js
index 3eee8f1..720b813 100644
--- a/tests/docx-reader.tests.js
+++ b/tests/docx-reader.tests.js
@@ -23,7 +23,7 @@ describe("docx-reader", function() {
"word/document.xml": testData("simple/word/document.xml")
});
return docxReader.read(docxFile).then(function(result) {
- assert.deepEqual(expectedDocument, result.value);
+ assert.deepEqual(expectedDocument, result.document);
});
});
@@ -32,7 +32,7 @@ describe("docx-reader", function() {
"word/document.xml": testData("paragraphStyles/word/document.xml")
});
return docxReader.read(docxFile).then(function(result) {
- var paragraph = result.value.children[0];
+ var paragraph = result.document.children[0];
assert.deepEqual("Heading1", paragraph.properties.styleName);
});
});
@@ -42,7 +42,7 @@ describe("docx-reader", function() {
"word/document.xml": testData("paragraphStyles/word/document.xml")
});
return docxReader.read(docxFile).then(function(result) {
- var paragraph = result.value.children[0];
+ var paragraph = result.document.children[0];
assert.equal(1, paragraph.children.length);
});
});