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

* Distinct "menus" vs "prompts" for theme.json so conflicting names can occur

Browse source 
* Add support for theming prompts
This commit is contained in:
Bryan Ashby 2015-05-14 14:56:02 -06:00
parent 34bf823f1f
commit 4e2c21059a
4 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/menu_util.js
View file

@ -217,18 +217,18 @@ function applyThemeCustomization(options) {
// options.name : menu/prompt name
// options.configMci : menu or prompt config (menu.json / prompt.json) specific mci section
// options.client : client
// options.type : menu|prompt
//
assert(_.isString(options.name));
assert("menus" === options.type || "prompts" === options.type);
assert(_.isObject(options.client));
console.log(options.configMci)
if(_.isUndefined(options.configMci)) {
options.configMci = {};
}
if(_.has(options.client.currentTheme, [ 'customization', 'byName', options.name ])) {
var themeConfig = options.client.currentTheme.customization.byName[options.name];
if(_.has(options.client.currentTheme, [ 'customization', options.type, options.name ])) {
var themeConfig = options.client.currentTheme.customization[options.type][options.name];
Object.keys(themeConfig).forEach(function mciEntry(mci) {
_.defaults(options.configMci[mci], themeConfig[mci]);
});

16
core/view_controller.js
View file

@ -397,6 +397,17 @@ ViewController.prototype.loadFromPromptConfig = function(options, cb) {
callback(err);
});
},
function applyThemeCustomization(callback) {
if(_.isObject(promptConfig)) {
menuUtil.applyThemeCustomization({
name : self.client.currentMenuModule.menuConfig.prompt,
type : "prompts",
client : self.client,
configMci : promptConfig.mci,
});
}
callback(null);
},
function applyViewConfiguration(callback) {
if(_.isObject(promptConfig.mci)) {
self.applyViewConfig(promptConfig, function configApplied(err, info) {
@ -511,18 +522,15 @@ ViewController.prototype.loadFromMenuConfig = function(options, cb) {
if(_.isObject(formConfig)) {
menuUtil.applyThemeCustomization({
name : self.client.currentMenuModule.menuName,
type : "menus",
client : self.client,
configMci : formConfig.mci,
});
}
//console.log(test)
callback(null);
},
function applyViewConfiguration(callback) {
//
// :TODO: need to merge configs from menu -> theme (specific) -> theme (default) -> defaults
if(_.isObject(formConfig)) {
self.applyViewConfig(formConfig, function configApplied(err, info) {
initialFocusId = info.initialFocusId;