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

* Re-work menu stack goto() a bit - cleaner, support 'mergeFlags', and 'forwardArgs' menuFlags.

Browse source 
* Add show_art.js module: Advanced ways to show art in menu stacks. For example, by extraArgs, fileBase area art, etc -- this will replace e.g. showing message conf art later as to be more generic
This commit is contained in:
Bryan Ashby 2018-06-16 10:01:08 -06:00
parent 5f0c9ed1ab
commit c9674e68fb
3 changed files with 193 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

27
core/menu_stack.js
View file

@ -97,6 +97,7 @@ module.exports = class MenuStack {
options = {};
}
options = options || {};
const self = this;
if(currentModuleInfo && name === currentModuleInfo.name) {
@ -111,10 +112,12 @@ module.exports = class MenuStack {
client : self.client,
};
if(_.isObject(options)) {
loadOpts.extraArgs = options.extraArgs || _.get(options, 'formData.value');
loadOpts.lastMenuResult = options.lastMenuResult;
if(currentModuleInfo && currentModuleInfo.menuFlags.includes('forwardArgs')) {
loadOpts.extraArgs = currentModuleInfo.extraArgs;
} else {
loadOpts.extraArgs = options.extraArgs || _.get(options, 'formData.value');
}
loadOpts.lastMenuResult = options.lastMenuResult;
loadMenu(loadOpts, (err, modInst) => {
if(err) {
@ -124,7 +127,21 @@ module.exports = class MenuStack {
} else {
self.client.log.debug( { menuName : name }, 'Goto menu module');
const menuFlags = (options && Array.isArray(options.menuFlags)) ? options.menuFlags : modInst.menuConfig.options.menuFlags;
//
// If menuFlags were supplied in menu.hjson, they should win over
// anything supplied in code.
//
let menuFlags;
if(0 === modInst.menuConfig.options.menuFlags.length) {
menuFlags = Array.isArray(options.menuFlags) ? options.menuFlags : [];
} else {
menuFlags = modInst.menuConfig.options.menuFlags;
// in code we can ask to merge in
if(Array.isArray(options.menuFlags) && options.menuFlags.includes('mergeFlags')) {
menuFlags = _.uniq(menuFlags.concat(options.menuFlags));
}
}
if(currentModuleInfo) {
// save stack state
@ -149,7 +166,7 @@ module.exports = class MenuStack {
});
// restore previous state if requested
if(options && options.savedState) {
if(options.savedState) {
modInst.restoreSavedState(options.savedState);
}