Skip to content

Commit

Permalink
[minor] Fix whitespaces
Browse files Browse the repository at this point in the history
  • Loading branch information
pksunkara committed Apr 14, 2012
1 parent 6ce0b7a commit 29eb5f9
Show file tree
Hide file tree
Showing 9 changed files with 126 additions and 126 deletions.
2 changes: 1 addition & 1 deletion lib/nconf.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ require('pkginfo')(module, 'version');
fs.readdirSync(__dirname + '/nconf/stores').forEach(function (file) {
var store = file.replace('.js', ''),
name = common.capitalize(store);

nconf.__defineGetter__(name, function () {
return require('./nconf/stores/' + store)[name];
});
Expand Down
10 changes: 5 additions & 5 deletions lib/nconf/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* (C) 2011, Nodejitsu Inc.
*
*/

var fs = require('fs'),
async = require('async'),
formats = require('./formats'),
Expand All @@ -15,7 +15,7 @@ var common = exports;
//
// ### function path (key)
// #### @key {string} The ':' delimited key to split
// Returns a fully-qualified path to a nested nconf key.
// Returns a fully-qualified path to a nested nconf key.
//
common.path = function (key) {
return key.split(':');
Expand Down Expand Up @@ -50,7 +50,7 @@ common.loadFiles = function (files, callback) {

function parseFile (file, next) {
fs.readFile(file, function (err, data) {
return !err
return !err
? next(null, options.format.parse(data.toString()))
: next(err);
});
Expand Down Expand Up @@ -91,13 +91,13 @@ common.loadFilesSync = function (files) {
//
common.merge = function (objs) {
var store = new Memory();

objs.forEach(function (obj) {
Object.keys(obj).forEach(function (key) {
store.merge(key, obj[key]);
});
});

return store.store;
};

Expand Down
Loading

0 comments on commit 29eb5f9

Please sign in to comment.