CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-05 08:00:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: Enable blocks if user can't manually enable them. (#8354)

Browse Source 
* fix: Enable blocks if user can't manually enable them.

* Only change the affected test method.
This commit is contained in:
John Nesky
2024-07-22 09:21:51 -07:00
committed by GitHub
parent 5cd3188b58
commit 40c6d9c490
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/block.ts
View File

@@ -1460,6 +1460,25 @@ export class Block implements IASTNodeLocation {
* update whether the block is currently disabled for this reason.
*/
setDisabledReason(disabled: boolean, reason: string): void {
// Workspaces that were serialized before the reason for being disabled
// could be specified may have blocks that are disabled without a known
// reason. On being loaded, these blocks will default to having the manually
// disabled reason. However, if the user isn't allowed to manually disable
// or enable blocks, then this manually disabled reason cannot be removed.
// For backward compatibility with these legacy workspaces, when removing
// any disabled reason and the workspace does not allow manually disabling
// but the block is manually disabled, then remove the manually disabled
// reason in addition to the more specific reason. For example, when an
// orphaned block is no longer orphaned, the block should be enabled again.
if (
!disabled &&
!this.workspace.options.disable &&
this.hasDisabledReason(constants.MANUALLY_DISABLED) &&
reason != constants.MANUALLY_DISABLED
) {
this.setDisabledReason(false, constants.MANUALLY_DISABLED);
}
if (this.disabledReasons.has(reason) !== disabled) {
if (disabled) {
this.disabledReasons.add(reason);

1
tests/mocha/blocks/procedures_test.js
View File

@@ -862,6 +862,7 @@ suite('Procedures', function () {
'if a procedure caller block was already disabled before ' +
'its definition was disabled, it is not reenabled',
function () {
this.workspace.options.disable = true;
const defBlock = createProcDefBlock(this.workspace);
const callBlock = createProcCallBlock(this.workspace);
this.clock.runAll();