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

Fix connection compatibility rules. Use the previous connection when 'pasting above' a block that already has a previous block.

Browse Source
This commit is contained in:
Sean Lip
2016-07-01 15:55:51 -07:00
parent a8bfc38545
commit f30bcbc0e7
2 changed files with 48 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
accessible/clipboard.service.js
View File

@@ -63,12 +63,22 @@ blocklyApp.ClipboardService = ng.core
return this.canBeCopiedToMarkedConnection(block);
},
canBeCopiedToMarkedConnection: function(block) {
var blockConnection = block.outputConnection || block.previousConnection;
return Boolean(
this.markedConnection_ &&
this.markedConnection_.sourceBlock_.workspace &&
this.areConnectionsCompatible_(
blockConnection, this.markedConnection_));
if (!this.markedConnection_ ||
!this.markedConnection_.getSourceBlock().workspace) {
return false;
}
var potentialConnections = [
block.outputConnection,
block.previousConnection,
block.nextConnection
];
var that = this;
return potentialConnections.some(function(connection) {
return that.areConnectionsCompatible_(
connection, that.markedConnection_);
});
},
markConnection: function(connection) {
this.markedConnection_ = connection;
@@ -110,9 +120,28 @@ blocklyApp.ClipboardService = ng.core
var xml = Blockly.Xml.blockToDom(block);
var reconstitutedBlock = Blockly.Xml.domToBlock(
blocklyApp.workspace, xml);
this.markedConnection_.connect(
reconstitutedBlock.outputConnection ||
reconstitutedBlock.previousConnection);
var potentialConnections = [
reconstitutedBlock.outputConnection,
reconstitutedBlock.previousConnection,
reconstitutedBlock.nextConnection
];
var connectionSuccessful = false;
for (var i = 0; i < potentialConnections.length; i++) {
if (this.areConnectionsCompatible_(
this.markedConnection_, potentialConnections[i])) {
this.markedConnection_.connect(potentialConnections[i]);
connectionSuccessful = true;
break;
}
}
if (!connectionSuccessful) {
console.error('ERROR: Could not connect block to marked spot.');
return;
}
if (announce) {
alert(
Blockly.Msg.PASTED_BLOCK_TO_MARKED_SPOT_MSG +

11
accessible/workspace-tree.component.js
View File

@@ -147,7 +147,16 @@ blocklyApp.WorkspaceTreeComponent = ng.core
pasteToConnection_: function(connection) {
var that = this;
this.treeService.runWhilePreservingFocus(function() {
that.clipboardService.pasteFromClipboard(connection);
// If the connection is a 'previousConnection' and that connection is
// already joined to something, use the 'nextConnection' of the
// previous block instead in order to do an insertion.
if (connection.type == Blockly.PREVIOUS_STATEMENT &&
connection.isConnected()) {
that.clipboardService.pasteFromClipboard(
connection.targetConnection);
} else {
that.clipboardService.pasteFromClipboard(connection);
}
}, this.tree.id);
},
sendToMarkedSpot_: function() {