0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2025-12-28 13:32:39 +00:00

Additional theme based error checking.

This commit is contained in:
David Bolack
2024-02-28 15:08:00 -06:00
parent 753b3befad
commit 4f90f92b38
3 changed files with 5 additions and 4 deletions

View File

@@ -193,14 +193,14 @@ const BrewRenderer = (props)=>{
// Override static theme values if a Brew theme.
if(themePath[0] == '#') {
if(themePath && themePath[0] === '#') {
themePath = themePath.slice(1);
rendererPath = '';
} else {
rendererPath += '/';
}
if(baseThemePath && baseThemePath[0] == '#') {
if(baseThemePath && baseThemePath[0] === '#') {
baseThemePath = baseThemePath.slice(1);
baseRendererPath = '';
} else {

View File

@@ -211,7 +211,8 @@ const MetadataEditor = createClass({
});
};
const currentTheme = mergedThemes[`${_.upperFirst(this.props.metadata.theme[0] === '#' ? 'Brew' : this.props.metadata.renderer)}`][this.props.metadata.theme];
const currentThemePath = this.props.metadata?.theme && this.props.metadata.theme[0] === '#' ? 'Brew' : this.props.metadata.renderer;
const currentTheme = mergedThemes[`${_.upperFirst(currentThemePath)}`][this.props.metadata.theme];
let dropdown;
if(this.props.metadata.renderer == 'legacy') {

View File

@@ -84,7 +84,7 @@ const Snippetbar = createClass({
compileSnippets : function(rendererPath, themePath, snippets) {
let compiledSnippets = snippets;
const baseSnippetsPath = themePath[0] != '#' ? Themes[rendererPath][themePath].baseSnippets : false;
const baseSnippetsPath = themePath && (themePath[0] === '#') ? false : Themes[rendererPath][themePath].baseSnippets;
const objB = _.keyBy(compiledSnippets, 'groupName');