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

Merge pull request #59 from orionhealth/bump-fix

Browse Source 
Fix the logic block to bump the correct block.
This commit is contained in:
Neil Fraser
2015-02-02 16:18:24 -08:00
parent 4db568a9bc 82f1ab1157
commit 43261ef086
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
blocks/logic.js
View File

@@ -312,19 +312,18 @@ Blockly.Blocks['logic_compare'] = {
}
var blockA = this.getInputTargetBlock('A');
var blockB = this.getInputTargetBlock('B');
// Keep track of which block was added second
// (so the first block may be ejected upon mismatch).
if (blockA && !blockB) {
this.blockAPriority_ = false;
} else if (!blockA && blockB) {
this.blockAPriority_ = true;
} else if (blockA && blockB &&
!blockA.outputConnection.checkType_(blockB.outputConnection)) {
// Mismatch between two inputs. Disconnect one and bump it away.
var child = this.blockAPriority_ ? blockB : blockA;
child.setParent(null);
child.bumpNeighbours_();
// Kick blocks that existed prior to this change if they don't match
if (this.blocks_ && blockA && blockB &&
!blockA.outputConnection.checkType_(blockB.outputConnection)) {
// Mismatch between two inputs. Disconnect previous and bump it away.
goog.array.forEach(this.blocks_, function(e) {
if (e === blockA || e === blockB) {
e.setParent(null);
e.bumpNeighbours_();
}
});
}
this.blocks_ = [blockA, blockB];
}
};