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

fix!: have disposing be true from start of dispose (#7891)

Browse Source
This commit is contained in:
Beka Westberg
2024-03-13 16:23:11 +00:00
committed by GitHub
parent 5d4e120d9a
commit a5126d1176
5 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/block.ts
View File

@@ -189,7 +189,7 @@ export class Block implements IASTNodeLocation, IDeletable {
/**
* Is the current block currently in the process of being disposed?
*/
private disposing = false;
protected disposing = false;
/**
* Has this block been fully initialized? E.g. all fields initailized.
@@ -319,7 +319,7 @@ export class Block implements IASTNodeLocation, IDeletable {
* children of this block.
*/
dispose(healStack: boolean) {
if (this.isDeadOrDying()) return;
this.disposing = true;
// Dispose of this change listener before unplugging.
// Technically not necessary due to the event firing delay.
@@ -342,15 +342,13 @@ export class Block implements IASTNodeLocation, IDeletable {
* E.g. does not fire events, unplug the block, etc.
*/
protected disposeInternal() {
if (this.isDeadOrDying()) return;
this.disposing = true;
if (this.onchangeWrapper_) {
this.workspace.removeChangeListener(this.onchangeWrapper_);
}
this.workspace.removeTypedBlock(this);
this.workspace.removeBlockById(this.id);
this.disposing = true;
if (typeof this.destroy === 'function') this.destroy();