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

Merge pull request #3147 from rachel-fenichel/misc_cleanup

Browse Source 
Misc cleanup
This commit is contained in:
Rachel Fenichel
2019-10-03 14:27:03 -07:00
committed by GitHub
parent 735a72c20a c5e691b88b
commit f2812df7dd
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/flyout_button.js
View File

@@ -48,7 +48,7 @@ Blockly.FlyoutButton = function(workspace, targetWorkspace, xml, isLabel) {
this.workspace_ = workspace;
/**
* @type {!Blockly.Workspace}
* @type {!Blockly.WorkspaceSvg}
* @private
*/
this.targetWorkspace_ = targetWorkspace;
@@ -234,13 +234,10 @@ Blockly.FlyoutButton.prototype.dispose = function() {
}
if (this.svgGroup_) {
Blockly.utils.dom.removeNode(this.svgGroup_);
this.svgGroup_ = null;
}
if (this.svgText_) {
this.workspace_.getThemeManager().unsubscribe(this.svgText_);
}
this.workspace_ = null;
this.targetWorkspace_ = null;
};
/**

6
core/workspace_svg.js
View File

@@ -921,7 +921,7 @@ Blockly.WorkspaceSvg.prototype.updateScreenCalculationsIfScrolled =
/**
* Get the SVG element that forms the drawing surface.
* @return {!Element} SVG element.
* @return {!SVGElement} SVG element.
*/
Blockly.WorkspaceSvg.prototype.getCanvas = function() {
return this.svgBlockCanvas_;
@@ -937,7 +937,7 @@ Blockly.WorkspaceSvg.prototype.getBubbleCanvas = function() {
/**
* Get the SVG element that contains this workspace.
* @return {Element} SVG element.
* @return {SVGElement} SVG element.
*/
Blockly.WorkspaceSvg.prototype.getParentSvg = function() {
if (this.cachedParentSvg_) {
@@ -949,7 +949,7 @@ Blockly.WorkspaceSvg.prototype.getParentSvg = function() {
this.cachedParentSvg_ = element;
return element;
}
element = element.parentNode;
element = /** @type {!SVGElement} */ (element.parentNode);
}
return null;
};

8
core/zoom_controls.js
View File

@@ -31,10 +31,14 @@ goog.require('Blockly.utils.dom');
/**
* Class for a zoom controls.
* @param {!Blockly.Workspace} workspace The workspace to sit in.
* @param {!Blockly.WorkspaceSVG} workspace The workspace to sit in.
* @constructor
*/
Blockly.ZoomControls = function(workspace) {
/**
* @type {!Blockly.WorkspaceSvg}
* @private
*/
this.workspace_ = workspace;
};
@@ -128,9 +132,7 @@ Blockly.ZoomControls.prototype.init = function(verticalSpacing) {
Blockly.ZoomControls.prototype.dispose = function() {
if (this.svgGroup_) {
Blockly.utils.dom.removeNode(this.svgGroup_);
this.svgGroup_ = null;
}
this.workspace_ = null;
};
/**