Show Categories that use custom code to load (variables, procedures) #483
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rschamp
suggested changes
Feb 28, 2017
src/util/filter-toolbox.js
Outdated
| if (category.nodeName.toLowerCase() !== 'category') continue; | ||
| var filteredCategory = filterToolboxNode(category, opcodes); | ||
| if (filteredCategory.hasChildNodes()) filteredToolbox.appendChild(filteredCategory); | ||
| if (!filteredCategory.hasChildNodes() && filteredCategory.hasAttribute("custom")) filteredToolbox.appendChild(filteredCategory); |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
rschamp
suggested changes
Feb 28, 2017
There was a problem hiding this comment.
Thanks @TheBrokenRail, nice catch. I have a suggestion to simplify this but looks like a good way to do it.
src/util/filter-toolbox.js
Outdated
| if (category.nodeName.toLowerCase() !== 'category') continue; | ||
| var filteredCategory = filterToolboxNode(category, opcodes); | ||
| if (filteredCategory.hasChildNodes()) filteredToolbox.appendChild(filteredCategory); | ||
| if (!filteredCategory.hasChildNodes() && filteredCategory.hasAttribute("custom")) filteredToolbox.appendChild(filteredCategory); |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
|
Fixed! |
rschamp
approved these changes
Mar 1, 2017
rschamp
pushed a commit
to rschamp/scratch-vm
that referenced
this pull request
Mar 9, 2017
…edures) (scratchfoundation#483)" This reverts commit 739c5de.
rschamp
added a commit
that referenced
this pull request
Mar 9, 2017
* Revert "Merge pull request #486 from rschamp/fix-filter-tests" This reverts commit ba00db8, reversing changes made to 739c5de. * Revert "Show Categories that use custom code to load (variables, procedures) (#483)" This reverts commit 739c5de. * Revert "Merge pull request #461 from rschamp/filter-toolbox" This reverts commit 343b5bf, reversing changes made to 370f2c6.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves
More of scratchfoundation/scratch-gui#16
Proposed Changes
If a category uses the "custom" tag to generate blocks don't delete in the filtered toolbox
Reason for Changes
So you can use thins like variables and custom blocks.