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

Merge branch 'master' into Issue_241_Part_II

Browse Source
This commit is contained in:
Trevor Buckner
2024-09-06 23:51:14 -04:00
committed by GitHub
parent 82f2d0254f 22678b15af
commit b124e55b3d
21 changed files with 1040 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/homebrew/editor/editor.jsx
View File

@@ -175,7 +175,10 @@ const Editor = createClass({
this.props.setMoveArrows(newView === 'text');
this.setState({
view : newView
}, this.updateEditorSize); //TODO: not sure if updateeditorsize needed
}, ()=>{
this.codeEditor.current?.codeMirror.focus();
this.updateEditorSize();
}); //TODO: not sure if updateeditorsize needed
},
getCurrentPage : function(){

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

@@ -70,7 +70,7 @@ const Snippetbar = createClass({
mergeCustomizer : function(oldValue, newValue, key) {
if(key == 'snippets') {
const result = _.reverse(_.unionBy(_.reverse(newValue), _.reverse(oldValue), 'name')); // Join snippets together, with preference for the child theme over the parent theme
return _.filter(result, 'gen'); //Only keep snippets with a 'gen' property.
return result.filter(snip => snip.gen || snip.subsnippets);
}
},