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

* New menu stack functional

Browse source 
* @systemMethod:fallbackMenu -> @systemMethod:prevMenu
* Lots of cleanup of gotoMenuModule() -> MenuModule.gotoMenu()
* Lots of cleanup of fallbackMenuModule() -> MenuModule.prevMenu()
* Lots of cleanup of 'next' processing -> MenuModule.nextMenu()
* Clean up CPU strings a bit more
This commit is contained in:
Bryan Ashby 2015-11-03 23:15:49 -07:00
parent 15ce69e02c
commit f7a7423b32
11 changed files with 86 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

109
core/client.js
View file

@ -94,7 +94,7 @@ function Client(input, output) {
this.user = new user.User();
this.currentTheme = { info : { name : 'N/A', description : 'None' } };
this.lastKeyPressMs = Date.now();
this.menuStack = new MenuStack();
this.menuStack = new MenuStack(this);
Object.defineProperty(this, 'node', {
get : function() {
@ -102,6 +102,12 @@ function Client(input, output) {
}
});
Object.defineProperty(this, 'currentMenuModule', {
get : function() {
return self.menuStack.getCurrentModule();
}
});
//
// Peek at incoming |data| and emit events for any special
@ -373,20 +379,6 @@ function Client(input, output) {
}
});
});
self.detachCurrentMenuModule = function() {
if(self.currentMenuModule) {
var savedState = self.currentMenuModule.getSaveState();
self.currentMenuModule.leave();
self.lastMenuModuleInfo = self.currentMenuModuleInfo;
self.lastMenuModuleInfo.savedState = savedState;
self.currentMenuModule = null;
}
};
}
require('util').inherits(Client, stream);
@ -423,7 +415,7 @@ Client.prototype.startIdleMonitor = function() {
};
Client.prototype.end = function () {
this.detachCurrentMenuModule();
this.menuStack.getCurrentModule().leave();
clearInterval(this.idleCheck);
@ -456,94 +448,15 @@ Client.prototype.address = function() {
return this.input.address();
};
// :TODO: remove these deprecated wrappers:
Client.prototype.gotoMenuModule = function(options, cb) {
var self = this;
assert(_.isString(options.name), 'Missing options.name');
// Assign a default missing module handler callback if none was provided
var callbackOnErrorOnly = !_.isFunction(cb);
cb = miscUtil.valueWithDefault(cb, self.defaultHandlerMissingMod());
self.detachCurrentMenuModule();
var loadOptions = {
name : options.name,
client : self,
extraArgs : options.extraArgs,
};
menuUtil.loadMenu(loadOptions, function menuModuleLoaded(err, modInst) {
if(err) {
cb(err);
} else {
self.log.debug( { menuName : options.name }, 'Goto menu module');
self.currentMenuModule = modInst; // :TODO: should probably be before enter() above
self.currentMenuModuleInfo = {
// :TODO: This is quite the hack... doesn't seem right...
menuName : self.currentMenuModule.menuName,
extraArgs : options.extraArgs,
}
if(options.savedState) {
modInst.restoreSavedState(options.savedState);
}
modInst.enter(self);
if(!callbackOnErrorOnly) {
cb(null);
}
}
});
this.menuStack.goto(options.name, options, cb);
};
Client.prototype.fallbackMenuModule = function(options, cb) {
var self = this;
var modOpts;
if(_.isString(self.currentMenuModule.menuConfig.fallback)) {
modOpts = {
name : self.currentMenuModule.menuConfig.fallback,
extraArgs : options.extraArgs,
};
} else if(self.lastMenuModuleInfo) {
modOpts = {
name : self.lastMenuModuleInfo.menuName,
extraArgs : self.lastMenuModuleInfo.extraArgs,
savedState : self.lastMenuModuleInfo.savedState,
};
}
if(modOpts) {
self.gotoMenuModule(modOpts, cb);
} else {
cb(new Error('Nothing to fallback to!'));
}
this.menuStack.prev(cb);
};
/*
Client.prototype.fallbackMenuModule = function(cb) {
var self = this;
if(self.lastMenuModuleInfo) {
var modOpts = {
name : self.lastMenuModuleInfo.menuName,
extraArgs : self.lastMenuModuleInfo.extraArgs,
savedState : self.lastMenuModuleInfo.savedState,
};
self.gotoMenuModule(modOpts, cb);
} else {
cb(new Error('Nothing to fallback to!'));
}
};
*/
///////////////////////////////////////////////////////////////////////////////
// Default error handlers
///////////////////////////////////////////////////////////////////////////////