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

* Add missing modules to package.json

Browse Source 
* Start replacing some code with momentjs
This commit is contained in:
Bryan Ashby
2015-07-22 16:37:11 -06:00
parent 735b572f9f
commit 40a4f8caba
4 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/menu_module.js
View File

@@ -43,7 +43,7 @@ function MenuModule(options) {
switch(artAsset.type) {
case 'art' :
theme.displayThemeArt(dispOptions, function displayed(err, themeArtData) {
cb(err, { mciMap : themeArtData.mciMap, height : themeArtData.extraInfo.height } );
cb(err, err ? null : { mciMap : themeArtData.mciMap, height : themeArtData.extraInfo.height } );
});
break;
@@ -77,7 +77,9 @@ function MenuModule(options) {
function displayMenuArt(callback) {
if(_.isString(self.menuConfig.art)) {
self.displayArtAsset(self.menuConfig.art, function displayed(err, artData) {
mciData.menu = artData.mciMap;
if(!err) {
mciData.menu = artData.mciMap;
}
callback(err);
});
} else {
@@ -103,7 +105,9 @@ function MenuModule(options) {
// :TODO: allow inline prompts in the future, e.g. @inline:memberName -> { "memberName" : { "text" : "stuff", ... } }
var promptConfig = self.menuConfig.promptConfig;
self.displayArtAsset(promptConfig.art, function displayed(err, artData) {
mciData.prompt = artData.mciMap;
if(!err) {
mciData.prompt = artData.mciMap;
}
callback(err);
});
} else {