f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-06 20:52:40 +00:00
Code Wiki Activity

Fix merging again.

Browse Source
This commit is contained in:
Trevor Buckner
2022-08-04 22:49:52 -04:00
parent 58edf329f5
commit 44dbb8f285
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,11 +80,11 @@ const Snippetbar = createClass({
let objB = _.keyBy(compiledSnippets, 'groupName'); let objB = _.keyBy(compiledSnippets, 'groupName');
if(baseSnippetsPath) { if(baseSnippetsPath) {
let objA = _.keyBy(_.cloneDeep(ThemeSnippets[`${rendererPath}_${baseSnippetsPath}`], 'groupName')); let objA = _.keyBy(_.cloneDeep(ThemeSnippets[`${rendererPath}_${baseSnippetsPath}`]), 'groupName');
compiledSnippets = _.values(_.mergeWith(objA, objB, this.mergeCustomizer)); compiledSnippets = _.values(_.mergeWith(objA, objB, this.mergeCustomizer));
} }
else { else {
let objA = _.keyBy(_.cloneDeep(ThemeSnippets[`${rendererPath}_Blank`], 'groupName')); let objA = _.keyBy(_.cloneDeep(ThemeSnippets[`${rendererPath}_Blank`]), 'groupName');
compiledSnippets = _.values(_.mergeWith(objA, objB, this.mergeCustomizer)); compiledSnippets = _.values(_.mergeWith(objA, objB, this.mergeCustomizer));
} }
return compiledSnippets; return compiledSnippets;

7
themes/V3/5ePHB/snippets.js
View File

@@ -61,12 +61,7 @@ module.exports = [
background-image: linear-gradient(-45deg, #322814, #998250, #322814); background-image: linear-gradient(-45deg, #322814, #998250, #322814);
line-height: 1em; line-height: 1em;
}\n\n` }\n\n`
}, }
{
name : 'Add Comment',
icon : 'fas fa-code',
gen : '/* This is a comment that will not be rendered into your brew. */'
},
] ]
}, },