From b606bc5ec6caa399eaa274b33383e5b05b68b3a7 Mon Sep 17 00:00:00 2001 From: Rachel Fenichel Date: Fri, 30 Nov 2018 14:36:37 -0800 Subject: [PATCH] Don't distinguish between first statement connection and others --- core/connection.js | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/core/connection.js b/core/connection.js index 990be154c..6e978dedc 100644 --- a/core/connection.js +++ b/core/connection.js @@ -355,29 +355,19 @@ Blockly.Connection.prototype.canConnectToPrevious_ = function(candidate) { return false; } - var firstStatementConnection = - this.sourceBlock_.getFirstStatementConnection(); - var isFirstStatementConnection = this == firstStatementConnection; - var isNextConnection = this == this.sourceBlock_.nextConnection; - - if (isNextConnection || isFirstStatementConnection) { - // If the candidate is the first connection in a stack, we can connect. - if (!candidate.targetConnection) { - return true; - } - - var targetBlock = candidate.targetBlock(); - // If it is connected to a real block, game over. - if (!targetBlock.isInsertionMarker()) { - return false; - } - // If it's connected to an insertion marker but that insertion marker - // is the first block in a stack, it's still fine. If that insertion - // marker is in the middle of a stack, it won't work. - return !targetBlock.getPreviousBlock(); + if (!candidate.targetConnection) { + return true; } - console.warn('Returning false by default from canConnectToPrevious_.'); - return false; + + var targetBlock = candidate.targetBlock(); + // If it is connected to a real block, game over. + if (!targetBlock.isInsertionMarker()) { + return false; + } + // If it's connected to an insertion marker but that insertion marker + // is the first block in a stack, it's still fine. If that insertion + // marker is in the middle of a stack, it won't work. + return !targetBlock.getPreviousBlock(); }; /**