mirror of
https://github.com/NuSkooler/enigma-bbs.git
synced 2025-06-05 04:07:23 +02:00
* Trailing LF handling is now 'trailingLF' option, with 'default', 'yes', 'no', etc.
* Initial checking of WIP Mystery Skulls theme by Luciano Ayres of blocktronics * Fix random theme selection * WIP on theme customization apply: Needs to be much more flexible than current * MenuModule will use .next > .fallback > default fallback
This commit is contained in:
parent
68b8af7975
commit
05812f57f0
25 changed files with 187 additions and 105 deletions
|
@ -79,7 +79,7 @@ function loadTheme(themeID, cb) {
|
|||
|
||||
var path = paths.join(Config.paths.themes, themeID, 'theme.hjson');
|
||||
|
||||
configCache.getConfig(path, function loaded(err, theme) {
|
||||
configCache.getConfigWithOptions( { filePath : path, forceReCache : true }, function loaded(err, theme) {
|
||||
if(err) {
|
||||
cb(err);
|
||||
} else {
|
||||
|
@ -195,12 +195,13 @@ function displayThemeArt(options, cb) {
|
|||
if(err) {
|
||||
cb(err);
|
||||
} else {
|
||||
// :TODO: just use simple merge of options -> displayOptions
|
||||
var dispOptions = {
|
||||
art : artInfo.data,
|
||||
sauce : artInfo.sauce,
|
||||
client : options.client,
|
||||
font : options.font,
|
||||
omitTrailingLF : options.omitTrailingLF,
|
||||
trailingLF : options.trailingLF,
|
||||
};
|
||||
|
||||
art.display(dispOptions, function displayed(err, mciMap, extraInfo) {
|
||||
|
@ -250,7 +251,7 @@ function displayThemedPause(options, cb) {
|
|||
displayThemedAsset(
|
||||
promptConfig.art,
|
||||
options.client,
|
||||
{ font : promptConfig.font, omitTrailingLF : true },
|
||||
promptConfig.options,
|
||||
function displayed(err, artData) {
|
||||
artInfo = artData;
|
||||
callback(err);
|
||||
|
@ -323,11 +324,12 @@ function displayThemedAsset(assetSpec, client, options, cb) {
|
|||
return;
|
||||
}
|
||||
|
||||
// :TODO: just use simple merge of options -> displayOptions
|
||||
var dispOpts = {
|
||||
name : artAsset.asset,
|
||||
client : client,
|
||||
font : options.font,
|
||||
omitTrailingLF : options.omitTrailingLF,
|
||||
trailingLF : options.trailingLF,
|
||||
};
|
||||
|
||||
switch(artAsset.type) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue