Warn if jsonInit() receives a colour attribute without a value. #1795
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
core/block.js
Outdated
| } catch (colorError) { | ||
| console.warn( | ||
| 'Block "' + blockTypeName + '": Illegal color value: ', rawValue); | ||
| if ('colour' in json) { |
There was a problem hiding this comment.
There's enough happening here to warrant pulling it out into a separate (private) function. Also worth doing because scratch-blocks and blockly handle colours slightly differently, so it's a point of merge conflicts.
After that, lgtm.
AnmAtAnm
force-pushed
the
colour-undefined
branch
from
15eb073
to
0278e91
Compare
AnmAtAnm
force-pushed
the
colour-undefined
branch
from
0278e91
to
28cbbcd
Compare
Adding block type name to prior warnings.
rachel-fenichel
approved these changes
Apr 18, 2018
rachel-fenichel
pushed a commit
to rachel-fenichel/blockly
that referenced
this pull request
Apr 18, 2018
…le#1795) * Warn if jsonInit() receives a colour attribute without a value. * Extract colour init code into function. * Adding block type name to prior warnings.
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.
The basics
The details
Resolves
Part of #1790.
Proposed Changes
In
jsonInit(), if the JSON object has acolourattribute, but not a value, emit a warning.For simplicity, this will occur on every block initialization of the given block type.
Reason for Changes
Warn developers that their blocks may be referencing a removed colour constant, or similar error.
Test Coverage
Ran the graph demo that was using the old constants. Saw the new warning.
After rebasing, tested against a
logic_booleanwith an explicitcolour: undefined.Tested on: