Limited block improvements #19678
Merged
Limited block improvements #19678
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
# Conflicts: # apps/package.json
joshlory
force-pushed
the
limited-block-improvements
branch
2 times, most recently
from
0002b5b
to
38bd9d9
Compare
joshlory
force-pushed
the
limited-block-improvements
branch
from
38bd9d9
to
ed96801
Compare
Hamms
approved these changes
Jan 3, 2018
| @@ -424,6 +424,7 @@ | |||
| "englishOnlyWarning": "Sorry! This stage is not available in your language. The puzzles in this stage use a mix of English words and characters that can’t be translated right now. You can move on to Stage {nextStage}.", | |||
| "enrollmentDescription": "Join your teacher's classroom by entering their section code below. Teachers will be able to see your course progress, projects, and reset your password in case you forget it.", | |||
| "errorEmptyFunctionBlockModal": "There need to be blocks inside your function definition. Click \"edit\" and drag blocks inside the green block.", | |||
| "errorExceededLimitedBlocks": "You did it! Now go find the pattern in your code and take out the extra blocks. You can only use {limit} of these blocks:", | |||
There was a problem hiding this comment.
👍 for "go find the pattern in your code"
apps/src/constants.js
Outdated
| @@ -63,6 +63,7 @@ exports.TestResults = { | |||
| LOCAL_FUNCTION_FAIL: -6, // The program contains an unexpected JavaScript local function | |||
| GENERIC_LINT_FAIL: -7, // The program contains a lint error | |||
| LOG_CONDITION_FAIL: -8, // The program execution log did not pass a required condition | |||
| EXCEEDED_LIMITED_BLOCKS: -9, // Puzzle was solved using more than the toolbox limit of a block | |||
There was a problem hiding this comment.
super-minor nit, but something like BLOCK_LIMIT_FAIL seems like it would better fit the pattern
apps/src/feedback.js
Outdated
| case TestResults.EXCEEDED_LIMITED_BLOCKS: | ||
| var exceededBlockType = this.hasExceededLimitedBlocks_(); | ||
| var limit = Blockly.mainBlockSpace.blockSpaceEditor.blockLimits.getLimit(exceededBlockType); | ||
| var block = `<xml><block type='${this.hasExceededLimitedBlocks_()}'></block></xml>`; |
There was a problem hiding this comment.
can be just type='${exceededBlockType}'
There was a problem hiding this comment.
Whoops 😳. Fixed in ae818e6!
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.
Depends on code-dot-org/blockly#75.