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

Cleanup code for new getConditionalValue() support

This commit is contained in:
Bryan Ashby 2018-06-13 20:59:43 -06:00
parent ceab8a0180
commit 1870db7d38
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/menu_stack.js
View File

@ -52,18 +52,13 @@ module.exports = class MenuStack {
const currentModuleInfo = this.top();
assert(currentModuleInfo, 'Empty menu stack!');
const menuConfig = currentModuleInfo.instance.menuConfig;
let nextMenu;
if(_.isArray(menuConfig.next)) {
nextMenu = this.client.acs.getConditionalValue(menuConfig.next, 'next');
if(!nextMenu) {
return cb(Errors.MenuStack('No matching condition for "next"', 'NOCONDMATCH'));
}
} else if(_.isString(menuConfig.next)) {
nextMenu = menuConfig.next;
} else {
return cb(Errors.MenuStack('Invalid or missing "next" member in menu config', 'BADNEXT'));
const menuConfig = currentModuleInfo.instance.menuConfig;
const nextMenu = this.client.acs.getConditionalValue(menuConfig.next, 'next');
if(!nextMenu) {
return cb(Array.isArray(menuConfig.next) ?
Errors.MenuStack('No matching condition for "next"', 'NOCONDMATCH') :
Errors.MenuStack('Invalid or missing "next" member in menu config', 'BADNEXT')
);
}
if(nextMenu === currentModuleInfo.name) {