From 7bc461ea833878fef147f6f683fbb9c6f2fd0eca Mon Sep 17 00:00:00 2001 From: Rachel Fenichel Date: Wed, 4 Aug 2021 17:17:24 -0700 Subject: [PATCH] polish: export draggingConnections directly --- core/block_dragger.js | 2 +- core/block_svg.js | 6 ++---- core/common.js | 25 ++----------------------- core/connection_checker.js | 4 ++-- tests/deps.js | 2 +- 5 files changed, 8 insertions(+), 31 deletions(-) diff --git a/core/block_dragger.js b/core/block_dragger.js index 7345c0327..6e5ac10c1 100644 --- a/core/block_dragger.js +++ b/core/block_dragger.js @@ -333,7 +333,7 @@ BlockDragger.prototype.maybeDeleteBlock_ = function() { // Fire a move event, so we know where to go back to for an undo. this.fireMoveEvent_(); this.draggingBlock_.dispose(false, true); - common.setDraggingConnections([]); + common.draggingConnections.length = 0; return true; } return false; diff --git a/core/block_svg.js b/core/block_svg.js index cbb69063e..fbd3dd5dc 100644 --- a/core/block_svg.js +++ b/core/block_svg.js @@ -825,13 +825,11 @@ Blockly.BlockSvg.prototype.setDragging = function(adding) { var group = this.getSvgRoot(); group.translate_ = ''; group.skew_ = ''; - var newList = - Blockly.common.getDraggingConnections().concat(this.getConnections_(true)); - Blockly.common.setDraggingConnections(newList); + Blockly.common.draggingConnections.push(...this.getConnections_(true)); Blockly.utils.dom.addClass( /** @type {!Element} */ (this.svgGroup_), 'blocklyDragging'); } else { - Blockly.common.setDraggingConnections([]); + Blockly.common.draggingConnections.length = 0; Blockly.utils.dom.removeClass( /** @type {!Element} */ (this.svgGroup_), 'blocklyDragging'); } diff --git a/core/common.js b/core/common.js index 762ac8f3f..b6d7ad369 100644 --- a/core/common.js +++ b/core/common.js @@ -77,27 +77,6 @@ exports.setParentContainer = setParentContainer; /** * All of the connections on blocks that are currently being dragged. - * @type {!Array.} + * @type {!Array} */ -let draggingConnections = []; - -/** - * Get the list of dragging connections. - * @returns {!Array.} The list of connections on blocks that are - * currently being dragged. - */ -const getDraggingConnections = function() { - return draggingConnections; -}; -/** @package **/ -exports.getDraggingConnections = getDraggingConnections; - -/** - * Set the list of dragging connections. - * @param {!Array.} connectionList The new list of connections on - * blocks that are currently being dragged. - */ -const setDraggingConnections = function(connectionList) { - draggingConnections = connectionList; -}; -exports.setDraggingConnections = setDraggingConnections; +exports.draggingConnections = []; diff --git a/core/connection_checker.js b/core/connection_checker.js index c6fb1fd9b..76162b017 100644 --- a/core/connection_checker.js +++ b/core/connection_checker.js @@ -240,7 +240,7 @@ ConnectionChecker.prototype.doDragChecks = function(a, b, distance) { } // Don't let blocks try to connect to themselves or ones they nest. - if (common.getDraggingConnections().indexOf(b) != -1) { + if (common.draggingConnections.indexOf(b) != -1) { return false; } @@ -264,7 +264,7 @@ ConnectionChecker.prototype.canConnectToPrevious_ = function(a, b) { } // Don't let blocks try to connect to themselves or ones they nest. - if (common.getDraggingConnections().indexOf(b) != -1) { + if (common.draggingConnections.indexOf(b) != -1) { return false; } diff --git a/tests/deps.js b/tests/deps.js index e1834d0a3..0cb50f476 100644 --- a/tests/deps.js +++ b/tests/deps.js @@ -11,7 +11,7 @@ goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'}); -goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']); +goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6'}); goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']); goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});