scratchfoundation/scratch-blocks
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-blocks.git synced 2025-08-28 22:10:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix connection disposal and get rid of startFlyout_

Browse source
This commit is contained in:
Rachel Fenichel 2016-07-12 15:15:35 -07:00
parent d3ea97cecc
commit 3202fcbd0c
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
core/block.js
View file

@ -258,6 +258,7 @@ Blockly.Block.prototype.dispose = function(healStack) {
if (connection.isConnected()) {
connection.disconnect();
}
connections[i].dispose();
}
} finally {
Blockly.Events.enable();

6
core/flyout.js
View file

@ -892,7 +892,6 @@ Blockly.Flyout.prototype.blockMouseDown_ = function(block) {
flyout.startDragMouseX_ = e.clientX;
Blockly.Flyout.startDownEvent_ = e;
Blockly.Flyout.startBlock_ = block;
Blockly.Flyout.startFlyout_ = flyout;
Blockly.Flyout.onMouseUpWrapper_ = Blockly.bindEvent_(document,
'mouseup', flyout, flyout.onMouseUp_);
Blockly.Flyout.onMouseMoveBlockWrapper_ = Blockly.bindEvent_(document,
@ -1237,9 +1236,7 @@ Blockly.Flyout.prototype.getClientRect = function() {
* @private
*/
Blockly.Flyout.terminateDrag_ = function() {
if (Blockly.Flyout.startFlyout_) {
Blockly.Flyout.startFlyout_.dragMode_ = Blockly.DRAG_NONE;
}
this.dragMode_ = Blockly.DRAG_NONE;
if (Blockly.Flyout.onMouseUpWrapper_) {
Blockly.unbindEvent_(Blockly.Flyout.onMouseUpWrapper_);
Blockly.Flyout.onMouseUpWrapper_ = null;
@ -1258,7 +1255,6 @@ Blockly.Flyout.terminateDrag_ = function() {
}
Blockly.Flyout.startDownEvent_ = null;
Blockly.Flyout.startBlock_ = null;
Blockly.Flyout.startFlyout_ = null;
};
/**