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

Remove unnecessary check when attaching a new block to a marked connection.

Browse Source
This commit is contained in:
Sean Lip
2017-01-17 15:52:04 -08:00
parent 211d973054
commit 5ed6b7a48d
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
accessible/toolbox-modal.service.js
View File

@@ -152,27 +152,17 @@ blocklyApp.ToolboxModalService = ng.core.Class({
this.showModal_(selectedToolboxCategories, function(block) {
var blockDescription = that.utilsService.getBlockDescription(block);
// Clean up the active desc for the destination tree.
var oldDestinationTreeId = that.treeService.getTreeIdForBlock(
// Clear the active desc for the destination tree, so that it can be
// cleanly reinstated after the new block is attached.
var destinationTreeId = that.treeService.getTreeIdForBlock(
that.blockConnectionService.getMarkedConnectionSourceBlock().id);
that.treeService.clearActiveDesc(oldDestinationTreeId);
that.treeService.clearActiveDesc(destinationTreeId);
var newBlockId = that.blockConnectionService.attachToMarkedConnection(
block);
// Invoke a digest cycle, so that the DOM settles.
setTimeout(function() {
that.treeService.focusOnBlock(newBlockId);
var newDestinationTreeId = that.treeService.getTreeIdForBlock(
newBlockId);
if (newDestinationTreeId != oldDestinationTreeId) {
// It is possible for the tree ID for the pasted block to change
// after the paste operation, e.g. when inserting a block between two
// existing blocks that are joined together. In this case, we need to
// also reset the active desc for the old destination tree.
that.treeService.initActiveDesc(oldDestinationTreeId);
}
that.notificationsService.speak(
'Attached. Now on, ' + blockDescription + ', block in workspace.');
});
@@ -187,6 +177,7 @@ blocklyApp.ToolboxModalService = ng.core.Class({
var xml = Blockly.Xml.blockToDom(block);
var newBlockId = Blockly.Xml.domToBlock(blocklyApp.workspace, xml).id;
// Invoke a digest cycle, so that the DOM settles.
setTimeout(function() {
that.treeService.focusOnBlock(newBlockId);
that.notificationsService.speak(

1
accessible/workspace.component.js
View File

@@ -39,6 +39,7 @@ blocklyApp.WorkspaceComponent = ng.core.Component({
(focus)="speakLocation(i)">
<blockly-workspace-block [level]="0" [block]="block" [tree]="tree" [isTopLevel]="true">
</blockly-workspace-block>
{{tree.id}}
</ol>
<span *ngIf="workspace.topBlocks_.length === 0">