f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2025-12-24 16:22:44 +00:00
Code Wiki Activity

Hide themes behind flag "enable_themes"

Browse Source
This commit is contained in:
Trevor Buckner
2022-09-05 17:05:37 -04:00
parent c2a5aad1e8
commit eae5fc9be9
6 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/homebrew/brewRenderer/brewRenderer.jsx
View File

@@ -1,3 +1,4 @@
/*eslint max-lines: ["warn", {"max": 300, "skipBlankLines": true, "skipComments": true}]*/
require('./brewRenderer.less');
const React = require('react');
const createClass = require('create-react-class');

2
client/homebrew/editor/metadataEditor/metadataEditor.jsx
View File

@@ -152,6 +152,8 @@ const MetadataEditor = createClass({
},
renderThemeDropdown : function(){
if(!global.enable_themes) return;
const listThemes = (renderer)=>{
return _.map(_.values(Themes[renderer]), (theme)=>{
return <div className='item' key={''} onClick={()=>this.handleTheme(theme)} title={''}>

11
client/homebrew/editor/snippetbar/snippetbar.jsx
View File

@@ -67,7 +67,7 @@ const Snippetbar = createClass({
},
mergeCustomizer : function(valueA, valueB, key) {
if(key == "snippets") {
if(key == 'snippets') {
const result = _.reverse(_.unionBy(_.reverse(valueB), _.reverse(valueA), 'name')); // Join snippets together, with preference for the current theme over the base theme
return _.filter(result, 'gen'); //Only keep snippets with a 'gen' property.
}
@@ -77,15 +77,14 @@ const Snippetbar = createClass({
let compiledSnippets = snippets;
const baseSnippetsPath = Themes[rendererPath][themePath].baseSnippets;
let objB = _.keyBy(compiledSnippets, 'groupName');
const objB = _.keyBy(compiledSnippets, 'groupName');
if(baseSnippetsPath) {
let objA = _.keyBy(_.cloneDeep(ThemeSnippets[`${rendererPath}_${baseSnippetsPath}`]), 'groupName');
const objA = _.keyBy(_.cloneDeep(ThemeSnippets[`${rendererPath}_${baseSnippetsPath}`]), 'groupName');
compiledSnippets = _.values(_.mergeWith(objA, objB, this.mergeCustomizer));
compiledSnippets = this.compileSnippets(rendererPath, baseSnippetsPath, _.cloneDeep(compiledSnippets));
}
else {
let objA = _.keyBy(_.cloneDeep(ThemeSnippets[`${rendererPath}_Blank`]), 'groupName');
} else {
const objA = _.keyBy(_.cloneDeep(ThemeSnippets[`${rendererPath}_Blank`]), 'groupName');
compiledSnippets = _.values(_.mergeWith(objA, objB, this.mergeCustomizer));
}
return compiledSnippets;

1
client/homebrew/homebrew.jsx
View File

@@ -54,6 +54,7 @@ const Homebrew = createClass({
global.account = this.props.account;
global.version = this.props.version;
global.enable_v3 = this.props.enable_v3;
global.enable_themes = this.props.enable_themes;
global.config = this.props.config;
return {};

2
client/homebrew/pages/newPage/newPage.jsx
View File

@@ -75,7 +75,7 @@ const NewPage = createClass({
// brew.title = metaStorage?.title || this.state.brew.title;
// brew.description = metaStorage?.description || this.state.brew.description;
brew.renderer = metaStorage?.renderer ?? brew.renderer;
brew.renderer = metaStorage?.theme ?? brew.theme;
brew.theme = metaStorage?.theme ?? brew.theme;
this.setState({
brew : brew