* New fallback with default vs explicit working

* New @systemMethod:fallbackMenu working
* Work on NUA flow: added preamble and some work on FSE related stuff
This commit is contained in:
Bryan Ashby 2015-09-23 23:41:06 -06:00
parent d63320e0b7
commit 903db84f23
7 changed files with 60 additions and 56 deletions

View file

@ -474,21 +474,20 @@ Client.prototype.fallbackMenuModule = function(options, cb) {
var modOpts;
if(_.isString(self.currentMenuModule.menuConfig.fallback)()) {
if(_.isString(self.currentMenuModule.menuConfig.fallback)) {
modOpts = {
name : self.currentMenuModule.menuConfig.fallback,
extraArgs : options.extraArgs,
};
self.gotoMenuModule(modOpts, cb);
} 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!'));