From 6f837980eb7be2758bbb8f7fe8a1c482e8e9bae5 Mon Sep 17 00:00:00 2001 From: David Bolack Date: Sat, 31 Aug 2024 13:54:52 -0500 Subject: [PATCH 1/5] All Snippet entries that have subsnippets but not generators. --- client/homebrew/editor/snippetbar/snippetbar.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/homebrew/editor/snippetbar/snippetbar.jsx b/client/homebrew/editor/snippetbar/snippetbar.jsx index af493c961..0cf5b0cce 100644 --- a/client/homebrew/editor/snippetbar/snippetbar.jsx +++ b/client/homebrew/editor/snippetbar/snippetbar.jsx @@ -70,7 +70,9 @@ 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 _.filter(result, function(snip) { + return(snip.hasOwnProperty('gen') || snip.hasOwnProperty('subsnippets')); + }); } }, From 5c9c342b10f2965375301c2aaa6aaf8d6bd1a642 Mon Sep 17 00:00:00 2001 From: David Bolack Date: Fri, 6 Sep 2024 01:25:13 -0500 Subject: [PATCH 2/5] Update client/homebrew/editor/snippetbar/snippetbar.jsx Co-authored-by: Trevor Buckner --- client/homebrew/editor/snippetbar/snippetbar.jsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/client/homebrew/editor/snippetbar/snippetbar.jsx b/client/homebrew/editor/snippetbar/snippetbar.jsx index 0cf5b0cce..c91a0bc47 100644 --- a/client/homebrew/editor/snippetbar/snippetbar.jsx +++ b/client/homebrew/editor/snippetbar/snippetbar.jsx @@ -70,9 +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, function(snip) { - return(snip.hasOwnProperty('gen') || snip.hasOwnProperty('subsnippets')); - }); + return result.filter(snip.gen || snip.subsnippets); } }, From e5d0051075ea180b423d8386bef395a46eb00c89 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Fri, 6 Sep 2024 15:57:33 -0400 Subject: [PATCH 3/5] Create pull_request_template.md --- .github/pull_request_template.md | 36 ++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 000000000..b02835726 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,36 @@ + + +## Description + + +## Related Issues or Discussions + +- Closes # + +## QA Instructions, Screenshots, Recordings + +_Please replace this line with instructions on how to test or view your changes, as well as any before/after +images for UI changes._ + +### Reviewer Checklist + +_Please replace the list below with specific features you want reviewers to look at._ + +*Reviewers, refer to this list when testing features, or suggest new items * +- [ ] Verify new features are functional + - [ ] Feature A does X + - [ ] Feature B does Y +- [ ] Verify old features have not broken + - [ ] Feature Z can still be used +- [ ] Test for edge cases / try to break things + - [ ] Feature A handles negative numbers +- [ ] Identify opportunities for simplification and refactoring +- [ ] Check for code legibility and appropriate comments + +
Copy this list From 22678b15afa59b9190863e551cd81c88933e1993 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Fri, 6 Sep 2024 16:35:18 -0400 Subject: [PATCH 4/5] Fix snippet filter --- client/homebrew/editor/snippetbar/snippetbar.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/homebrew/editor/snippetbar/snippetbar.jsx b/client/homebrew/editor/snippetbar/snippetbar.jsx index c91a0bc47..f2680079e 100644 --- a/client/homebrew/editor/snippetbar/snippetbar.jsx +++ b/client/homebrew/editor/snippetbar/snippetbar.jsx @@ -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 result.filter(snip.gen || snip.subsnippets); + return result.filter(snip => snip.gen || snip.subsnippets); } }, From f0a8bf379a958bad97f689f1cf3572495ae216c5 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Fri, 6 Sep 2024 16:43:44 -0400 Subject: [PATCH 5/5] Fix non-uniform spacing/indenting --- themes/V3/5ePHB/snippets.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/themes/V3/5ePHB/snippets.js b/themes/V3/5ePHB/snippets.js index f3ada5789..05c28a17b 100644 --- a/themes/V3/5ePHB/snippets.js +++ b/themes/V3/5ePHB/snippets.js @@ -107,8 +107,8 @@ module.exports = [ name : 'Enable H1-H3 all pages', icon : 'fas fa-dice-three', gen : dedent`/* Add ToC include for H3 level Headers */ - .page h3 { - --TOC: include; + .page h3 { + --TOC: include; }\n\n` }, { @@ -116,7 +116,7 @@ module.exports = [ icon : 'fas fa-dice-four', gen : dedent`/* Add ToC include for H3 and H4 level Headers */ .page h3, .page h4 { - --TOC: include; + --TOC: include; }\n\n` }, { @@ -124,7 +124,7 @@ module.exports = [ icon : 'fas fa-dice-five', gen : dedent`/* Add ToC include for H3, H4, and H5 level Headers */ .page h3, .page h4, .page h5 { - --TOC: include; + --TOC: include; }\n\n` }, { @@ -132,7 +132,7 @@ module.exports = [ icon : 'fas fa-dice-six', gen : dedent`/* Add ToC include for H3, H4, H5, and H6 level Headers */ .page h3, .page h4, .page h5, .page h6 { - --TOC: include; + --TOC: include; }\n\n` }, ]