Fixes for LB page and readonly blockspace #35523
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
| @@ -1040,7 +1039,11 @@ exports.createJsWrapperBlockCreator = function( | |||
| }); | |||
| } | |||
| }); | |||
| if (appOptions.level.miniToolbox && !appOptions.readonlyWorkspace) { | |||
| if ( | |||
| !window.appOptions || | |||
There was a problem hiding this comment.
i don't understand the addition of !window.appOptions here -- why do we init mini-toolbox if we don't have appOptions?
(out of curiosity) are we moving away from using /* global appOptions */ in favor of window.appOptions?
There was a problem hiding this comment.
This is for the levelbuilder block page which doesn't have appOptions but we do want to render the mini toolbox blocks.
There was a problem hiding this comment.
ah, right, that makes sense!
There was a problem hiding this comment.
(added a comment to the code for clarity)
maddiedierker
approved these changes
Jun 29, 2020
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.
Relies on code-dot-org/blockly#233
Before:
After (not perfect, but at least not broken):
Also switches the default on the pointer blocks to be the long string, so that it renders properly in instructions:
Before:
After:
Links
Testing story
Reviewer Checklist: