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

Add isDragging to canConnectWithReason and delete newly unused code paths.

Browse Source
This commit is contained in:
Rachel Fenichel
2020-07-14 16:57:29 -06:00
parent e3c8d834cb
commit e24f3cef9b
9 changed files with 63 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
blocks/logic.js
View File

@@ -543,9 +543,8 @@ Blockly.Constants.Logic.LOGIC_COMPARE_ONCHANGE_MIXIN = {
var blockB = this.getInputTargetBlock('B');
// Disconnect blocks that existed prior to this change if they don't match.
if (blockA && blockB &&
//!this.workspace.connectionTypeChecker.checkType(
//blockA.outputConnection, blockB.outputConnection)) {
!blockA.outputConnection.checkType(blockB.outputConnection)) {
!this.workspace.connectionTypeChecker.doTypeChecks(
blockA.outputConnection, blockB.outputConnection)) {
// Mismatch between two inputs. Revert the block connections,
// bumping away the newly connected block(s).
Blockly.Events.setGroup(e.group);
@@ -613,9 +612,8 @@ Blockly.Constants.Logic.LOGIC_TERNARY_ONCHANGE_MIXIN = {
for (var i = 0; i < 2; i++) {
var block = (i == 1) ? blockA : blockB;
if (block &&
// !block.workspace.connectionTypeChecker.checkType(
// block.outputConnection, parentConnection)) {
!block.outputConnection.checkType(parentConnection)) {
!block.workspace.connectionTypeChecker.doTypeChecks(
block.outputConnection, parentConnection)) {
// Ensure that any disconnections are grouped with the causing event.
Blockly.Events.setGroup(e.group);
if (parentConnection === this.prevParentConnection_) {