Move reading of actual docx files into docx-reader

1 files changed, 5 insertions, 17 deletions

diff --git a/lib/docx/content-types-reader.js b/lib/docx/content-types-reader.js
index 0a74eb9..c8a28a4 100644
--- a/lib/docx/content-types-reader.js
+++ b/lib/docx/content-types-reader.js
@@ -1,16 +1,11 @@
-var readXmlFromZipFile = require("./office-xml-reader").readXmlFromZipFile;
-
-exports.readContentTypesFromZipFile = readContentTypesFromZipFile;
 exports.readContentTypesFromXml = readContentTypesFromXml;
+exports.defaultContentTypes = {
+    findContentType: function(path) {
+        return null;
+    }
+};
 
 
-function readContentTypesFromZipFile(file) {
-    return readXmlFromZipFile(file, "[Content_Types].xml")
-        .then(function(xml) {
-            return xml ? readContentTypesFromXml(xml) : defaultContentTypes;
-        });
-}
-
 function readContentTypesFromXml(xml) {
     var extensionDefaults = {};
     var overrides = {};
@@ -41,10 +36,3 @@ function readContentTypesFromXml(xml) {
         }
     }
 }
-
-
-var defaultContentTypes = {
-    findContentType: function(path) {
-        return null;
-    }
-};