Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove row healing for block deletion #4832 #4873

Merged
merged 8 commits into from
Jun 9, 2021
Merged

Remove row healing for block deletion #4832 #4873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
801867f
Fixed JS/PHP generators for math_number
jschanker Jan 25, 2018
819607b
Merge branch 'develop' of https://github.com/google/blockly
jschanker May 27, 2020
4e6a8f0
Merge branch 'google:develop' into develop
jschanker Jun 4, 2021
32264a5
Remove row healing for block deletion #4832
jschanker Jun 4, 2021
3cc5744
Remove row healing for context menu block deletion
jschanker Jun 4, 2021
9567b4c
Update Blockly.deleteBlock to remove row healing
jschanker Jun 8, 2021
83d295b
Replace block deletion code with deleteBlock call
jschanker Jun 8, 2021
c82f41b
Replace block deletion code with deleteBlock call
jschanker Jun 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion core/blockly.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,12 @@ Blockly.deleteBlock = function(selected) {
if (!selected.workspace.isFlyout) {
Blockly.Events.setGroup(true);
Blockly.hideChaff();
selected.dispose(/* heal */ true, true);
if (selected.outputConnection) {
// Do not attempt to heal rows (https://github.com/google/blockly/issues/4832)
selected.dispose(false, true);
} else {
selected.dispose(/* heal */ true, true);
}
Blockly.Events.setGroup(false);
}
};
Expand Down
4 changes: 3 additions & 1 deletion core/contextmenu_items.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,9 @@ Blockly.ContextMenuItems.registerDelete = function() {
},
callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
Blockly.Events.setGroup(true);
scope.block.dispose(true, true);
if (scope.block) {
Blockly.deleteBlock(scope.block);
}
Blockly.Events.setGroup(false);
},
scopeType: Blockly.ContextMenuRegistry.ScopeType.BLOCK,
Expand Down