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

Fix missing themeId

This commit is contained in:
Bryan Ashby 2020-06-18 20:46:24 -06:00
parent 5c99cd6cb5
commit ce15511cf1
No known key found for this signature in database
GPG Key ID: B49EB437951D2542
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/theme.js
View File

@ -163,7 +163,7 @@ exports.ThemeManager = class ThemeManager {
} }
// merge menu.hjson+theme.hjson/etc. to the final usable theme // merge menu.hjson+theme.hjson/etc. to the final usable theme
this._finalizeTheme(themeConfig); this._finalizeTheme(themeId, themeConfig);
// Theme is valid and enabled; update it in available themes // Theme is valid and enabled; update it in available themes
this.availableThemes.set(themeId, themeConfig); this.availableThemes.set(themeId, themeConfig);
@ -174,7 +174,7 @@ exports.ThemeManager = class ThemeManager {
); );
} }
_finalizeTheme(themeConfig) { _finalizeTheme(themeId, themeConfig) {
// These TODOs are left over from the old system - decide what/if to do with them: // These TODOs are left over from the old system - decide what/if to do with them:
// :TODO: merge in defaults (customization.defaults{} ) // :TODO: merge in defaults (customization.defaults{} )
// :TODO: apply generic stuff, e.g. "VM" (vs "VM1") // :TODO: apply generic stuff, e.g. "VM" (vs "VM1")
@ -185,7 +185,7 @@ exports.ThemeManager = class ThemeManager {
const theme = themeConfig.get(); const theme = themeConfig.get();
// some data brought directly over // some data brought directly over
mergedTheme.info = theme.info; mergedTheme.info = Object.assign({}, theme.info, { themeId });
mergedTheme.achievements = _.get(theme, 'customization.achievements'); mergedTheme.achievements = _.get(theme, 'customization.achievements');
// Create some helpers for this theme // Create some helpers for this theme