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

* More minor WIP on making theme merging more flexible

This commit is contained in:
Bryan Ashby 2015-09-27 19:33:25 -06:00
parent 05812f57f0
commit 78f6915577
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/view_controller.js
View File

@ -210,7 +210,7 @@ function ViewController(options) {
var submitId; var submitId;
var initialFocusId = 1; var initialFocusId = 1;
async.each(Object.keys(config.mci), function entry(mci, nextItem) { async.each(Object.keys(config.mci || {}), function entry(mci, nextItem) {
var mciMatch = mci.match(MCI_REGEXP); // :TODO: How to handle auto-generated IDs???? var mciMatch = mci.match(MCI_REGEXP); // :TODO: How to handle auto-generated IDs????
if(null === mciMatch) { if(null === mciMatch) {
self.client.log.warn( { mci : mci }, 'Unable to parse MCI code'); self.client.log.warn( { mci : mci }, 'Unable to parse MCI code');
@ -572,15 +572,16 @@ ViewController.prototype.loadFromMenuConfig = function(options, cb) {
}, },
function applyThemeCustomization(callback) { function applyThemeCustomization(callback) {
//if(_.isObject(formConfig)) { //if(_.isObject(formConfig)) {
formConfig = formConfig || {}
menuUtil.applyThemeCustomization({ menuUtil.applyThemeCustomization({
name : self.client.currentMenuModule.menuName, name : self.client.currentMenuModule.menuName,
type : 'menus', type : 'menus',
client : self.client, client : self.client,
configMci : formConfig ? formConfig.mci : {}, configMci : formConfig.mci,
formId : formIdKey, formId : formIdKey,
}); });
//} //}
callback(null); callback(null);
}, },
function applyViewConfiguration(callback) { function applyViewConfiguration(callback) {