moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Config.general.menuFile: Specify name or path of menu HJSON file. Defaults to menu.hjson in mods

This commit is contained in:
Bryan Ashby 2015-12-11 13:58:58 -07:00
parent bd4c50fa8d
commit 0d477210f9
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/config.js
View File

@ -85,8 +85,11 @@ function getDefaultConfig() {
closedSystem : false, // is the system closed to new users? closedSystem : false, // is the system closed to new users?
loginAttempts : 3, loginAttempts : 3,
menuFile : 'menu.hjson', // Override to use something else, e.g. demo.hjson. Can be a full path (defaults to ./mods)
}, },
// :TODO: see notes below about 'theme' section - move this!
preLoginTheme : '*', preLoginTheme : '*',
users : { users : {

9
core/menu_util.js
View File

@ -31,7 +31,14 @@ function getMenuConfig(name, cb) {
async.waterfall( async.waterfall(
[ [
function loadMenuJSON(callback) { function loadMenuJSON(callback) {
configCache.getModConfig('menu.hjson', function loaded(err, menuJson) { var menuFilePath = Config.general.menuFile;
// menuFile is assumed to be in 'mods' if a path is not supplied
if('.' === paths.dirname(menuFilePath)) {
menuFilePath = paths.join(__dirname, '../mods', menuFilePath);
}
configCache.getConfig(menuFilePath, function loaded(err, menuJson) {
callback(err, menuJson); callback(err, menuJson);
}); });
}, },