Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

make it possible to use other formats than json in common.loadFiles a…

…nd common.loadFilesSync
  • Loading branch information...
commit 8e987b8d3da9cc6d0a061ce2062c688d17043ac3 1 parent f9b24f1
@tellnes authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 lib/nconf/common.js
View
4 lib/nconf/common.js
@@ -58,7 +58,7 @@ common.loadFiles = function (files, callback) {
});
}
- async.map(files, parseFile, function (err, objs) {
+ async.map(options.files, parseFile, function (err, objs) {
return err ? callback(err) : callback(null, common.merge(objs));
});
};
@@ -80,7 +80,7 @@ common.loadFilesSync = function (files) {
var options = Array.isArray(files) ? { files: files } : files;
options.format = options.format || formats.json;
- return common.merge(files.map(function (file) {
+ return common.merge(options.files.map(function (file) {
return options.format.parse(fs.readFileSync(file, 'utf8'));
}));
};
Please sign in to comment.
Something went wrong with that request. Please try again.