[Google Blockly] fixes for flappy validation #36331
Merged
Conversation
This file contains 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
breville
reviewed
Aug 18, 2020
apps/src/required_block_utils.js
Outdated
| @@ -1,5 +1,6 @@ | |||
| /* global Text */ | |||
|
|
|||
| var experiments = require('@cdo/apps/util/experiments'); | |||
There was a problem hiding this comment.
Can we switch based on which wrapper we are using, rather than which experiment?
breville
reviewed
Aug 18, 2020
apps/src/required_block_utils.js
Outdated
Comment on lines
229
to
231
| // Google's Blockly has slightly different tag names, but our validation code | ||
| // expects all the tag names to be consistent with our Blockly. This mapping | ||
| // ensures we will validate correctly in both versions of Blockly. |
There was a problem hiding this comment.
We should be consistent with naming old & new Blockly..
breville
reviewed
Aug 18, 2020
Comment on lines
150
to
157
| blocklyWrapper.Xml.originalBlockToDom = blocklyWrapper.Xml.blockToDom; | ||
| blocklyWrapper.Xml.blockToDom = function(block, ignoreChildBlocks) { | ||
| const blockXml = blocklyWrapper.Xml.originalBlockToDom(block); | ||
| if (ignoreChildBlocks) { | ||
| Blockly.Xml.deleteNext(blockXml); | ||
| } | ||
| return blockXml; | ||
| }; |
There was a problem hiding this comment.
Neat trick. Might be worth calling out with a comment..
breville
approved these changes
Aug 18, 2020
ajpal
changed the title
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.
Fixes two issues that were preventing validation from working properly:
<title>elements, while in Google Blockly they're in<field>elements.ignoreChildBlocksforBlockly.Xml.blockToDomdoes not exist in Google Blockly.With these fixes, I can complete the Flappy HOC:
Links
Testing story
Reviewer Checklist: