zydronium/enigma-bbs
1
0
Fork 0
mirror of https://github.com/NuSkooler/enigma-bbs.git synced 2025-08-03 08:22:02 +02:00
Code Issues Projects Releases Packages Wiki Activity

* Use lodash for Config.js / config.json merge

Browse source
This commit is contained in:
Bryan Ashby 2015-08-05 22:22:17 -06:00
parent ab40eb1fd4
commit 82f3bc7601
3 changed files with 22 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

22
core/config.js
View file

@ -13,24 +13,6 @@ exports.init = init;
exports.getDefaultPath = getDefaultPath;
function init(configPath, cb) {
// Probably many better ways of doing this:
// :TODO: See http://jsfiddle.net/jlowery2663/z8at6knn/4/
var recursiveMerge = function(target, source) {
for(var p in source) {
try {
if(_.isObject(source)) {
target[p] = recursiveMerge(target[p], source[p]);
} else {
target[p] = source[p];
}
} catch(e) {
target[p] = source[p];
}
}
return target;
};
async.waterfall(
[
function loadUserConfig(callback) {
@ -48,8 +30,8 @@ function init(configPath, cb) {
}
});
},
function mergeWithDefaultConfig(menuConfig, callback) {
var mergedConfig = recursiveMerge(menuConfig, getDefaultConfig());
function mergeWithDefaultConfig(configJson, callback) {
var mergedConfig = _.defaultsDeep(configJson, getDefaultConfig());
callback(null, mergedConfig);
}
],