Upstream merge March 15 & remove Lua generators #123
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
with a manual calculation. getBBox() can cause the browser to re-layout the whole page and we have much of the information (e.g. individual block height and width) we need already cached. Note that getBoundingRectangle's calculation is slightly different than the one returned by getBBox. It is off by 3 in the y direction due to how one of the curves is drawn. This new calculation is technically more accurate.
Fix connection.closest and tests.
Require ConnectionDB where needed; recompile
Replace the call to getBBox() in getMainWorkspaceMetrics
…h a dragging stack.
This meant that variables could be called _, conflicting with use in Lua as a dummy variable, and in particular with scrubNakedValue.
Also fix a return type warning in one of the branches.
Don't connect a block with no next connection if that would force a b…
consider the last block on the stack when looking for places to attac…
Add missing comma to Lua reserved words
Some bugs in undoing function argument changes.
# Conflicts: # blockly_compressed_vertical.js # blockly_uncompressed_vertical.js # blocks/text.js # core/block_svg.js
|
Go for it! |
rachel-fenichel
added
pr - changes requested
pr - good to merge
and removed
pr - good to merge
labels
|
Merging this so I can keep moving forward. |
rachel-fenichel
added a commit
that referenced
this pull request
Mar 16, 2016
Upstream merge March 15 & remove Lua generators
BeksOmega
pushed a commit
to BeksOmega/scratch-blocks
that referenced
this pull request
Aug 19, 2024
github-actions bot
pushed a commit
that referenced
this pull request
Oct 18, 2024
# [1.2.0-beta.1](v1.1.86...v1.2.0-beta.1) (2024-10-18) ### Bug Fixes * Add support for flyout labels with status indicators ([#212](#212)) ([665d196](665d196)) * add support for Scratch-style block comments ([#83](#83)) ([8902091](8902091)) * add support for Scratch-style procedures ([#39](#39)) ([13647eb](13647eb)) * add zoom controls config ([#126](#126)) ([a09ae24](a09ae24)) * allow focusing fields in the flyout on mobile ([#184](#184)) ([6c9d3a6](6c9d3a6)) * allow specifying the function to be used for prompting about variable creation/edits ([#106](#106)) ([4cfe66f](4cfe66f)) * clean up data block definitions ([#90](#90)) ([9ea96e2](9ea96e2)) * correctly align extension block icons ([#182](#182)) ([e3dbad1](e3dbad1)) * delete context menu to display the correct number of blocks ([#127](#127)) ([a65d24a](a65d24a)) * **deps:** after installing deps, replace Blockly v11 with v12 RC ([677ff6f](677ff6f)) * **deps:** clone Blockly RC over HTTP instead of SSH ([8a861f0](8a861f0)) * display icons in the toolbox for extension categories ([#47](#47)) ([b53eadd](b53eadd)) * don't hide the drag surface ([#38](#38)) ([7f70f09](7f70f09)) * don't show global/local options when renaming a variable ([#123](#123)) ([22a6b73](22a6b73)) * don't show scope options when renaming a variable from the variable getter context menu ([#139](#139)) ([375e56d](375e56d)) * don't warn about procedure references when moving the definition on the workspace ([#131](#131)) ([cda58cc](cda58cc)) * enable and style workspace comments ([#82](#82)) ([98ccb62](98ccb62)) * enable dragging arguments out of procedure blocks ([#119](#119)) ([0ca0620](0ca0620)) * Export colours. ([7c346fa](7c346fa)) * Export Scratch messages. ([09326a1](09326a1)) * fix a crash when adding a broadcast message ([#150](#150)) ([8e165ce](8e165ce)) * fix alignment of "define" text baseline on custom blocks ([#220](#220)) ([cc4d9f9](cc4d9f9)) * fix bug that caused the number/string input in the custom block editor to have square corners ([#213](#213)) ([c3ee958](c3ee958)) * fix bug that could cause duplicated procedure argument blocks to create more duplicates on drag ([#217](#217)) ([6a1c8a9](6a1c8a9)) * fix bug that prevented modal dialogs from appearing on mobile ([#183](#183)) ([37e0f10](37e0f10)) * fix bug that prevented showing the contextual menu on blocks ([#176](#176)) ([2e98ff1](2e98ff1)) * fix color of block reporter dropdown text ([#205](#205)) ([73d978e](73d978e)) * fix dropdown menu metrics ([#148](#148)) ([40eee91](40eee91)) * fix exception when editing custom blocks ([#105](#105)) ([7478546](7478546)) * fix positioning of categories when scrolling via the toolbox ([#186](#186)) ([6d14530](6d14530)) * fix styling of dropdown menus ([#152](#152)) ([0e80277](0e80277)) * fix the color of procedure argument blocks ([#216](#216)) ([88c700e](88c700e)) * fix the colors of the angle picker dropdown ([#179](#179)) ([59896d2](59896d2)) * fix the flyout width at 250 pixels ([#168](#168)) ([a47aba6](a47aba6)) * fix the styling of contextual menus ([#147](#147)) ([6fbc2e5](6fbc2e5)) * fix toolbox category selection ([#141](#141)) ([d3e1a1b](d3e1a1b)) * fix wrapping of long category labels ([#166](#166)) ([7b39ac1](7b39ac1)) * fixed bug where broadcast messages would appear in the variable dropdown list ([#124](#124)) ([b1e67f6](b1e67f6)) * improve positioning of newly created procedure blocks ([#121](#121)) ([84a9e5b](84a9e5b)) * improve reliability of block value reporting ([#77](#77)) ([cb5b068](cb5b068)) * improve sizing and rendering of comments ([#219](#219)) ([1279c0a](1279c0a)) * load CSS and fix up UI appearance ([#33](#33)) ([1645129](1645129)) * load the continuous toolbox ([#31](#31)) ([ea68b1c](ea68b1c)) * make block images work in all contexts ([#30](#30)) ([920febf](920febf)) * make FieldNumber a subclass of FieldTextInput ([#214](#214)) ([3ae2235](3ae2235)) * make variable names case-sensitive ([#122](#122)) ([46854cd](46854cd)) * match Scratch behaviors around dragging and connection stickiness ([#80](#80)) ([fd1bc58](fd1bc58)) * miscellaneous UI fixits ([#41](#41)) ([300a1ce](300a1ce)) * modernize and reenable the colour slider field ([#42](#42)) ([4f97982](4f97982)) * more closely align flyout layout with Scratch ([#45](#45)) ([49663ed](49663ed)) * prevent deleting procedure definition blocks with references by dragging to the flyout ([#120](#120)) ([fa9367d](fa9367d)) * prevent dragging blocks into the slot occupied by the procedure definition block's example caller block ([#118](#118)) ([453ffa9](453ffa9)) * re-export scratch-blocks utility functions ([#26](#26)) ([685ecfc](685ecfc)) * readd the control blocks ([#22](#22)) ([f69d4ac](f69d4ac)) * readd the data blocks ([#29](#29)) ([fafed65](fafed65)) * readd the event blocks ([#21](#21)) ([4de530f](4de530f)) * readd the looks blocks ([#23](#23)) ([34f07c0](34f07c0)) * readd the motion blocks ([#20](#20)) ([79398c2](79398c2)) * readd the operator blocks and dependencies ([#19](#19)) ([8024e9f](8024e9f)) * readd the sensing blocks ([#27](#27)) ([9f5f135](9f5f135)) * readd the sound blocks ([#24](#24)) ([6837513](6837513)) * reenable reporting block values ([#55](#55)) ([70c8cfd](70c8cfd)) * reenable shadows for blocks being dragged ([#79](#79)) ([94d2a2c](94d2a2c)) * reenable support for checkboxes in the flyout ([#43](#43)) ([e603c67](e603c67)) * reenable support for dragging blocks between sprites ([#130](#130)) ([3d8b998](3d8b998)) * reenable the matrix field ([#49](#49)) ([aa3341b](aa3341b)) * reenable the mobile numpad field ([#54](#54)) ([003afd0](003afd0)) * reenable the note block and picker field ([#48](#48)) ([de62d77](de62d77)) * reenable the vertical separator field ([#46](#46)) ([48e931f](48e931f)) * remove canvas transition ([#129](#129)) ([ff4b115](ff4b115)) * remove underscore from a few createProcedureDefCallback calls ([#40](#40)) ([4e794f6](4e794f6)) * render the procedure definition block like Scratch ([#115](#115)) ([2a543f5](2a543f5)) * resolve error when adding the stop block to the workspace ([#56](#56)) ([f3e059c](f3e059c)) * resolve various UI issues ([#117](#117)) ([4b74d5c](4b74d5c)) * select new variable blocks' monitor checkboxes after creation ([#140](#140)) ([3811d93](3811d93)) * show connection highlights for boolean inputs ([#181](#181)) ([303611a](303611a)) * show the glow only when blocks are running ([#57](#57)) ([33e9e91](33e9e91)) * show the name of the list in the list getter block context menu ([#132](#132)) ([eb839fc](eb839fc)) * update the flyout for compatibility with the new flyout API ([#209](#209)) ([7ce9991](7ce9991)) * use non-deprecated input type constants ([#78](#78)) ([1f1c859](1f1c859)) * use Scratch-style text blocks ([#37](#37)) ([6bbbdf7](6bbbdf7)) * use Scratch's FieldAngle ([#138](#138)) ([ef7911c](ef7911c)) ### Features * add a block inflater that supports recycling ([#207](#207)) ([0701679](0701679)) * add bubbles/icons for block flyout checkboxes ([#208](#208)) ([39b2162](39b2162)) * add custom Scratch variable model and creation event classes ([#86](#86)) ([2598ede](2598ede)) * clean up and export Scratch's variables.js ([#88](#88)) ([5c1acfe](5c1acfe)) * readd support for the custom Data toolbox category ([#87](#87)) ([dcfbf39](dcfbf39)) * reenable Scratch's FieldVariable subclass ([#91](#91)) ([7c891e3](7c891e3)) ### Reverts * Revert "fix: add zoom controls config (#126)" (#128) ([8e1dc14](8e1dc14)), closes [#126](#126) [#128](#128)
github-actions bot
pushed a commit
that referenced
this pull request
Oct 21, 2024
# [2.0.0-spork.1](v1.1.86...v2.0.0-spork.1) (2024-10-21) ### Bug Fixes * Add support for flyout labels with status indicators ([#212](#212)) ([665d196](665d196)) * add support for Scratch-style block comments ([#83](#83)) ([8902091](8902091)) * add support for Scratch-style procedures ([#39](#39)) ([13647eb](13647eb)) * add zoom controls config ([#126](#126)) ([a09ae24](a09ae24)) * allow focusing fields in the flyout on mobile ([#184](#184)) ([6c9d3a6](6c9d3a6)) * allow specifying the function to be used for prompting about variable creation/edits ([#106](#106)) ([4cfe66f](4cfe66f)) * clean up data block definitions ([#90](#90)) ([9ea96e2](9ea96e2)) * correctly align extension block icons ([#182](#182)) ([e3dbad1](e3dbad1)) * delete context menu to display the correct number of blocks ([#127](#127)) ([a65d24a](a65d24a)) * **deps:** after installing deps, replace Blockly v11 with v12 RC ([677ff6f](677ff6f)) * **deps:** clone Blockly RC over HTTP instead of SSH ([8a861f0](8a861f0)) * display icons in the toolbox for extension categories ([#47](#47)) ([b53eadd](b53eadd)) * don't hide the drag surface ([#38](#38)) ([7f70f09](7f70f09)) * don't include Blockly RC source in npm package ([21b15d1](21b15d1)) * don't show global/local options when renaming a variable ([#123](#123)) ([22a6b73](22a6b73)) * don't show scope options when renaming a variable from the variable getter context menu ([#139](#139)) ([375e56d](375e56d)) * don't warn about procedure references when moving the definition on the workspace ([#131](#131)) ([cda58cc](cda58cc)) * enable and style workspace comments ([#82](#82)) ([98ccb62](98ccb62)) * enable dragging arguments out of procedure blocks ([#119](#119)) ([0ca0620](0ca0620)) * Export colours. ([7c346fa](7c346fa)) * Export Scratch messages. ([09326a1](09326a1)) * fix a crash when adding a broadcast message ([#150](#150)) ([8e165ce](8e165ce)) * fix alignment of "define" text baseline on custom blocks ([#220](#220)) ([cc4d9f9](cc4d9f9)) * fix bug that caused the number/string input in the custom block editor to have square corners ([#213](#213)) ([c3ee958](c3ee958)) * fix bug that could cause duplicated procedure argument blocks to create more duplicates on drag ([#217](#217)) ([6a1c8a9](6a1c8a9)) * fix bug that prevented modal dialogs from appearing on mobile ([#183](#183)) ([37e0f10](37e0f10)) * fix bug that prevented showing the contextual menu on blocks ([#176](#176)) ([2e98ff1](2e98ff1)) * fix color of block reporter dropdown text ([#205](#205)) ([73d978e](73d978e)) * fix dropdown menu metrics ([#148](#148)) ([40eee91](40eee91)) * fix exception when editing custom blocks ([#105](#105)) ([7478546](7478546)) * fix positioning of categories when scrolling via the toolbox ([#186](#186)) ([6d14530](6d14530)) * fix styling of dropdown menus ([#152](#152)) ([0e80277](0e80277)) * fix the color of procedure argument blocks ([#216](#216)) ([88c700e](88c700e)) * fix the colors of the angle picker dropdown ([#179](#179)) ([59896d2](59896d2)) * fix the flyout width at 250 pixels ([#168](#168)) ([a47aba6](a47aba6)) * fix the styling of contextual menus ([#147](#147)) ([6fbc2e5](6fbc2e5)) * fix toolbox category selection ([#141](#141)) ([d3e1a1b](d3e1a1b)) * fix wrapping of long category labels ([#166](#166)) ([7b39ac1](7b39ac1)) * fixed bug where broadcast messages would appear in the variable dropdown list ([#124](#124)) ([b1e67f6](b1e67f6)) * hide disable and inline inputs contextual menu items ([#35](#35)) ([c548298](c548298)) * improve positioning of newly created procedure blocks ([#121](#121)) ([84a9e5b](84a9e5b)) * improve reliability of block value reporting ([#77](#77)) ([cb5b068](cb5b068)) * improve sizing and rendering of comments ([#219](#219)) ([1279c0a](1279c0a)) * load CSS and fix up UI appearance ([#33](#33)) ([1645129](1645129)) * load the continuous toolbox ([#31](#31)) ([ea68b1c](ea68b1c)) * make block images work in all contexts ([#30](#30)) ([920febf](920febf)) * make FieldNumber a subclass of FieldTextInput ([#214](#214)) ([3ae2235](3ae2235)) * make variable names case-sensitive ([#122](#122)) ([46854cd](46854cd)) * match Scratch behaviors around dragging and connection stickiness ([#80](#80)) ([fd1bc58](fd1bc58)) * miscellaneous UI fixits ([#41](#41)) ([300a1ce](300a1ce)) * modernize and reenable the colour slider field ([#42](#42)) ([4f97982](4f97982)) * more closely align flyout layout with Scratch ([#45](#45)) ([49663ed](49663ed)) * prevent deleting procedure definition blocks with references by dragging to the flyout ([#120](#120)) ([fa9367d](fa9367d)) * prevent dragging blocks into the slot occupied by the procedure definition block's example caller block ([#118](#118)) ([453ffa9](453ffa9)) * re-export scratch-blocks utility functions ([#26](#26)) ([685ecfc](685ecfc)) * readd the control blocks ([#22](#22)) ([f69d4ac](f69d4ac)) * readd the data blocks ([#29](#29)) ([fafed65](fafed65)) * readd the event blocks ([#21](#21)) ([4de530f](4de530f)) * readd the looks blocks ([#23](#23)) ([34f07c0](34f07c0)) * readd the motion blocks ([#20](#20)) ([79398c2](79398c2)) * readd the operator blocks and dependencies ([#19](#19)) ([8024e9f](8024e9f)) * readd the sensing blocks ([#27](#27)) ([9f5f135](9f5f135)) * readd the sound blocks ([#24](#24)) ([6837513](6837513)) * reenable reporting block values ([#55](#55)) ([70c8cfd](70c8cfd)) * reenable shadows for blocks being dragged ([#79](#79)) ([94d2a2c](94d2a2c)) * reenable support for checkboxes in the flyout ([#43](#43)) ([e603c67](e603c67)) * reenable support for dragging blocks between sprites ([#130](#130)) ([3d8b998](3d8b998)) * reenable the matrix field ([#49](#49)) ([aa3341b](aa3341b)) * reenable the mobile numpad field ([#54](#54)) ([003afd0](003afd0)) * reenable the note block and picker field ([#48](#48)) ([de62d77](de62d77)) * reenable the vertical separator field ([#46](#46)) ([48e931f](48e931f)) * remove canvas transition ([#129](#129)) ([ff4b115](ff4b115)) * remove underscore from a few createProcedureDefCallback calls ([#40](#40)) ([4e794f6](4e794f6)) * render the procedure definition block like Scratch ([#115](#115)) ([2a543f5](2a543f5)) * resolve error when adding the stop block to the workspace ([#56](#56)) ([f3e059c](f3e059c)) * resolve various UI issues ([#117](#117)) ([4b74d5c](4b74d5c)) * select new variable blocks' monitor checkboxes after creation ([#140](#140)) ([3811d93](3811d93)) * show connection highlights for boolean inputs ([#181](#181)) ([303611a](303611a)) * show the glow only when blocks are running ([#57](#57)) ([33e9e91](33e9e91)) * show the name of the list in the list getter block context menu ([#132](#132)) ([eb839fc](eb839fc)) * update the flyout for compatibility with the new flyout API ([#209](#209)) ([7ce9991](7ce9991)) * use non-deprecated input type constants ([#78](#78)) ([1f1c859](1f1c859)) * use Scratch-style text blocks ([#37](#37)) ([6bbbdf7](6bbbdf7)) * use Scratch's FieldAngle ([#138](#138)) ([ef7911c](ef7911c)) * fix!: bump to v2.0 to reflect Blockly un-forking ([899a981](899a981)) ### Features * add a block inflater that supports recycling ([#207](#207)) ([0701679](0701679)) * add bubbles/icons for block flyout checkboxes ([#208](#208)) ([39b2162](39b2162)) * add custom Scratch variable model and creation event classes ([#86](#86)) ([2598ede](2598ede)) * clean up and export Scratch's variables.js ([#88](#88)) ([5c1acfe](5c1acfe)) * readd support for the custom Data toolbox category ([#87](#87)) ([dcfbf39](dcfbf39)) * reenable Scratch's FieldVariable subclass ([#91](#91)) ([7c891e3](7c891e3)) ### Reverts * Revert "fix: add zoom controls config (#126)" (#128) ([8e1dc14](8e1dc14)), closes [#126](#126) [#128](#128) ### BREAKING CHANGES * scratch-blocks is no longer a divergent fork of Blockly, and instead depends on Blockly as a regular node_modules dependency. Thanks, @gonfunko and everyone else at Google who helped with this effort!
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.
@rachel-fenichel Seems to me should be ready to merge, but let me know if we should wait!