Merge google/blockly, May 2017 #881
Merged
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
Routine rebuild
…field_undo Fix two event bugs on fields
…drag surface. Do this by applying the same style to text elements in the drag surface that we do in the main svg. (scratchfoundation#805)
See thread in support group before merging.
…connect_under_flyout Don't connect to blocks under the flyout.
Fix german translation
…a parallel directory
Thanks to PR scratchfoundation#813 by ademenev
…re-compiler-npm-module Use the npm closure library
…dropdown field labels Adding support for string table lookups in dropdown field labels specified in JSON. Adds Blockly.utils.replaceMessageReferences() method to handle string replacement without interpolation tokens. Effectively uses the same old code, now moved into tokenizeInterpolation_(), which takes a parseInterpolationTokens option. Replaces the direct JavaScript references (not pure JSON, and thus not portable). Demonstrating this behavior in the logic_boolean dropdown.
…/mirror_naming Naming changes in mirror demo
This will be used to define constants accessible in JSON block definitions. Messages with descriptions that include `{{Notranslate}}` will not be included in the translation files sent to TranslateWiki. Instead, they are written to `msg/json/constants.json`, and later merged back into the `.js` files, similar to synonyms.
Template details: https://translatewiki.net/wiki/Template:Notranslate
…ratchfoundation#825) String replacement for the colour, tooltip text and help URL attributes of JSON defined blocks. Demonstrated in logic_boolean.
thisandagain
reviewed
May 9, 2017
core/block_svg.js
Outdated
| * Does nothing if useDragSurface_ is false. | ||
| * @private | ||
| */ | ||
| Blockly.BlockSvg.prototype.moveToDragSurface_ = function() { |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
thisandagain
reviewed
May 9, 2017
core/block_svg.js
Outdated
| * Does nothing if useDragSurface_ is false. | ||
| * @private | ||
| */ | ||
| Blockly.BlockSvg.prototype.moveOffDragSurface_ = function() { |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
thisandagain
reviewed
May 9, 2017
core/block_svg.js
Outdated
| * Used when the block is switching from 3d to 2d transform or vice versa. | ||
| * @private | ||
| */ | ||
| Blockly.BlockSvg.prototype.clearTransformAttributes_ = function() { |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
core/workspace.js
Outdated
| @@ -490,8 +491,8 @@ Blockly.Workspace.prototype.fireChangeListener = function(event) { | |||
| */ | |||
| Blockly.Workspace.prototype.getBlockById = function(id) { | |||
| var block = this.blockDB_[id]; | |||
| if (!block && this.getFlyout() && this.getFlyout().getWorkspace()) { | |||
| block = this.getFlyout().getWorkspace().blockDB_[id]; | |||
| if (!block && this.getFlyout_() && this.getFlyout_().getWorkspace()) { | |||
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.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
core/block.js
Outdated
| @@ -1388,7 +1388,8 @@ Blockly.Block.newFieldImageFromJson_ = function(options) { | |||
| var height = | |||
| Number(Blockly.utils.replaceMessageReferences(options['height'])); | |||
| var alt = Blockly.utils.replaceMessageReferences(options['alt']); | |||
| return new Blockly.FieldImage(src, width, height, alt); | |||
| var flip_rtl = Blockly.utils.replaceMessageReferences(options['flip_rtl']); | |||
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
|
This is looking really good @paulkaplan. Thanks for pulling this together. I am able to build and testing in both the horizontal and vertical playgrounds looks good so far. 👍 |
thisandagain
approved these changes
May 10, 2017
|
Looks good to me as well, aside from the getFlyout_ issue that I pointed out (which can be resolved in a followup). Make sure you squash it when you merge, please |
rachel-fenichel
approved these changes
May 10, 2017
picklesrus
reviewed
May 10, 2017
| @@ -235,12 +235,6 @@ Blockly.FieldAngle.prototype.setText = function(text) { | |||
| return; | |||
| } | |||
| this.updateGraph_(); | |||
| // Insert degree symbol. | |||
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
|
🎉 |
|
|
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.
In Progress
Merge google/blockly develop into scratch-blocks develop.
Issues that need to be sorted before merging:
Cannot find module "./shim/blockly_compressed_vertical-blocks_compressedcore/workspace.js(allInputsFilled)core/field.js(getDisplayText_)