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

Unbind event handlers in dispose of zoom controls. (#4031)

Browse Source 
* Unbind event handlers in dispose of zoom controls.

* Move event handler references to constructor.
This commit is contained in:
Monica Kozbial
2020-07-10 17:34:53 -07:00
committed by GitHub
parent d3b8b78035
commit 40efb59a34
1 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
core/zoom_controls.js
View File

@@ -29,6 +29,30 @@ Blockly.ZoomControls = function(workspace) {
* @private
*/
this.workspace_ = workspace;
/**
* A handle to use to unbind the mouse down event handler for zoom reset
* button. Opaque data returned from Blockly.bindEventWithChecks_.
* @type {?Blockly.EventData}
* @private
*/
this.onZoomResetWrapper_ = null;
/**
* A handle to use to unbind the mouse down event handler for zoom in button.
* Opaque data returned from Blockly.bindEventWithChecks_.
* @type {?Blockly.EventData}
* @private
*/
this.onZoomInWrapper_ = null;
/**
* A handle to use to unbind the mouse down event handler for zoom out button.
* Opaque data returned from Blockly.bindEventWithChecks_.
* @type {?Blockly.EventData}
* @private
*/
this.onZoomOutWrapper_ = null;
};
/**
@@ -80,6 +104,7 @@ Blockly.ZoomControls.prototype.left_ = 0;
*/
Blockly.ZoomControls.prototype.top_ = 0;
/**
* Create the zoom controls.
* @return {!SVGElement} The zoom controls SVG group.
@@ -122,6 +147,15 @@ Blockly.ZoomControls.prototype.dispose = function() {
if (this.svgGroup_) {
Blockly.utils.dom.removeNode(this.svgGroup_);
}
if (this.onZoomResetWrapper_) {
Blockly.unbindEvent_(this.onZoomResetWrapper_);
}
if (this.onZoomInWrapper_) {
Blockly.unbindEvent_(this.onZoomInWrapper_);
}
if (this.onZoomOutWrapper_) {
Blockly.unbindEvent_(this.onZoomOutWrapper_);
}
};
/**
@@ -209,7 +243,7 @@ Blockly.ZoomControls.prototype.createZoomOutSvg_ = function(rnd) {
this.workspace_.options.pathToMedia + Blockly.SPRITE.url);
// Attach listener.
Blockly.bindEventWithChecks_(
this.onZoomOutWrapper_ = Blockly.bindEventWithChecks_(
zoomoutSvg, 'mousedown', null, this.zoom_.bind(this, -1));
};
@@ -256,7 +290,7 @@ Blockly.ZoomControls.prototype.createZoomInSvg_ = function(rnd) {
this.workspace_.options.pathToMedia + Blockly.SPRITE.url);
// Attach listener.
Blockly.bindEventWithChecks_(
this.onZoomInWrapper_ = Blockly.bindEventWithChecks_(
zoominSvg, 'mousedown', null, this.zoom_.bind(this, 1));
};
@@ -320,7 +354,7 @@ Blockly.ZoomControls.prototype.createZoomResetSvg_ = function(rnd) {
this.workspace_.options.pathToMedia + Blockly.SPRITE.url);
// Attach event listeners.
Blockly.bindEventWithChecks_(
this.onZoomResetWrapper_ = Blockly.bindEventWithChecks_(
zoomresetSvg, 'mousedown', null, this.resetZoom_.bind(this));
};