Merge branch 'master' of ssh://numinibsd/git/base/enigma-bbs
This commit is contained in:
commit
cdb3b70f2e
|
@ -499,18 +499,6 @@ ViewController.prototype.loadFromPromptConfig = function(options, cb) {
|
||||||
callback(err);
|
callback(err);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
function applyThemeCustomization(callback) {
|
|
||||||
// :TODO: apply .config customization as well
|
|
||||||
if(_.isObject(promptConfig)) {
|
|
||||||
menuUtil.applyMciThemeCustomization({
|
|
||||||
name : promptName,
|
|
||||||
type : "prompts",
|
|
||||||
client : self.client,
|
|
||||||
mci : promptConfig.mci
|
|
||||||
});
|
|
||||||
}
|
|
||||||
callback(null);
|
|
||||||
},
|
|
||||||
function applyViewConfiguration(callback) {
|
function applyViewConfiguration(callback) {
|
||||||
if(_.isObject(promptConfig.mci)) {
|
if(_.isObject(promptConfig.mci)) {
|
||||||
self.applyViewConfig(promptConfig, function configApplied(err, info) {
|
self.applyViewConfig(promptConfig, function configApplied(err, info) {
|
||||||
|
@ -614,6 +602,7 @@ ViewController.prototype.loadFromMenuConfig = function(options, cb) {
|
||||||
callback(err);
|
callback(err);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
/*
|
||||||
function applyThemeCustomization(callback) {
|
function applyThemeCustomization(callback) {
|
||||||
formConfig = formConfig || {};
|
formConfig = formConfig || {};
|
||||||
formConfig.mci = formConfig.mci || {};
|
formConfig.mci = formConfig.mci || {};
|
||||||
|
@ -636,6 +625,7 @@ ViewController.prototype.loadFromMenuConfig = function(options, cb) {
|
||||||
|
|
||||||
callback(null);
|
callback(null);
|
||||||
},
|
},
|
||||||
|
*/
|
||||||
function applyViewConfiguration(callback) {
|
function applyViewConfiguration(callback) {
|
||||||
if(_.isObject(formConfig)) {
|
if(_.isObject(formConfig)) {
|
||||||
self.applyViewConfig(formConfig, function configApplied(err, info) {
|
self.applyViewConfig(formConfig, function configApplied(err, info) {
|
||||||
|
|
Loading…
Reference in New Issue