From 35bf2bbed6bae48ff87fcf3f39d176060ef95866 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Tue, 23 Jan 2018 21:30:32 +0000 Subject: Use word/document.xml as fallback --- lib/docx/docx-reader.js | 3 ++- test/docx/docx-reader.tests.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/docx/docx-reader.js b/lib/docx/docx-reader.js index 8423782..898da1d 100644 --- a/lib/docx/docx-reader.js +++ b/lib/docx/docx-reader.js @@ -81,7 +81,8 @@ function read(docxFile, input) { } function findDocumentFilename(docxFile, relationships) { - var targets = ["word/document.xml"].concat(relationships.findTargetsByType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument")); + var officeDocumentType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument"; + var targets = relationships.findTargetsByType(officeDocumentType).concat(["word/document.xml"]); var normalisedTargets = targets.map(function(target) { return stripPrefix(target, "/"); }); diff --git a/test/docx/docx-reader.tests.js b/test/docx/docx-reader.tests.js index f353930..5313906 100644 --- a/test/docx/docx-reader.tests.js +++ b/test/docx/docx-reader.tests.js @@ -44,7 +44,7 @@ var relationshipNamespaces = { "r": "http://schemas.openxmlformats.org/package/2006/relationships" }; -test("when document.xml is not present then document is found using _rels/.rels", function() { +test("main document is found using _rels/.rels", function() { var relationships = xml.element("r:Relationships", {}, [ xml.element("r:Relationship", { "Type": "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument", -- cgit v1.2.3