Remove Files.relativeToFile() in favour of options argument

2 files changed, 6 insertions, 9 deletions

diff --git a/lib/docx/docx-reader.js b/lib/docx/docx-reader.js
index 0d48d0a..342ec46 100644
--- a/lib/docx/docx-reader.js
+++ b/lib/docx/docx-reader.js
@@ -21,7 +21,9 @@ var Files = require("./files").Files;
 function read(docxFile, input) {
     input = input || {};
 
-    var files = input.path ? Files.relativeToFile(input.path) : new Files(null);
+    var files = new Files({
+        relativeToFile: input.path
+    });
 
     return promises.props({
         contentTypes: readContentTypesFromZipFile(docxFile),
diff --git a/lib/docx/files.js b/lib/docx/files.js
index 502db08..4b09b69 100644
--- a/lib/docx/files.js
+++ b/lib/docx/files.js
@@ -12,7 +12,9 @@ exports.Files = Files;
 exports.uriToPath = uriToPath;
 
 
-function Files(base) {
+function Files(options) {
+    var base = options.relativeToFile ? dirname(options.relativeToFile) : null;
+
     function read(uri, encoding) {
         return resolveUri(uri).then(function(path) {
             return readFile(path, encoding).caught(function(error) {
@@ -39,13 +41,6 @@ function Files(base) {
 }
 
 
-function relativeToFile(filePath) {
-    return new Files(dirname(filePath));
-}
-
-Files.relativeToFile = relativeToFile;
-
-
 var readFile = promises.promisify(fs.readFile.bind(fs));