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

Implement correct behaviour for copying a block from the toolbox to a marked spot.

Browse Source
This commit is contained in:
Sean Lip
2016-07-21 16:48:08 -07:00
parent 606a5e1d08
commit c4abbff496
3 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
accessible/clipboard.service.js
View File

@@ -116,7 +116,7 @@ blocklyApp.ClipboardService = ng.core
Blockly.Msg.PASTED_BLOCK_FROM_CLIPBOARD_MSG +
reconstitutedBlock.toString());
},
pasteToMarkedConnection: function(block, announce) {
pasteToMarkedConnection: function(block) {
var xml = Blockly.Xml.blockToDom(block);
var reconstitutedBlock = Blockly.Xml.domToBlock(
blocklyApp.workspace, xml);
@@ -142,12 +142,6 @@ blocklyApp.ClipboardService = ng.core
return;
}
if (announce) {
alert(
Blockly.Msg.PASTED_BLOCK_TO_MARKED_SPOT_MSG +
reconstitutedBlock.toString());
}
this.markedConnection_ = null;
return reconstitutedBlock.id;

53
accessible/toolbox-tree.component.js
View File

@@ -45,25 +45,26 @@ blocklyApp.ToolboxTreeComponent = ng.core
[attr.aria-labelledBy]="generateAriaLabelledByAttr(idMap['workspaceCopyButton'], 'blockly-button')"
[attr.aria-level]="level + 2" aria-selected="false">
<button #workspaceCopyButton [id]="idMap['workspaceCopyButton']"
(click)="copyToWorkspace(block)">
(click)="copyToWorkspace()">
{{'COPY_TO_WORKSPACE'|translate}}
</button>
</li>
<li #blockCopy [id]="idMap['blockCopy']" role="treeitem"
[attr.aria-labelledBy]="generateAriaLabelledByAttr(idMap['blockCopyButton'], 'blockly-button')"
[attr.aria-level]="level + 2" aria-selected="false">
<button #blockCopyButton [id]="idMap['blockCopyButton']"
(click)="clipboardService.copy(block, true)">
<button #blockCopyButton
[id]="idMap['blockCopyButton']"
(click)="copyToClipboard()">
{{'COPY_TO_CLIPBOARD'|translate}}
</button>
</li>
<li #sendToSelected [id]="idMap['sendToSelected']" role="treeitem"
[attr.aria-labelledBy]="generateAriaLabelledByAttr(idMap['sendToSelectedButton'], 'blockly-button', !canBeCopiedToMarkedConnection(block))"
[attr.aria-labelledBy]="generateAriaLabelledByAttr(idMap['sendToSelectedButton'], 'blockly-button', !canBeCopiedToMarkedConnection())"
[attr.aria-level]="level + 2" aria-selected="false">
<button #sendToSelectedButton
[id]="idMap['sendToSelectedButton']"
(click)="copyToMarkedSpot(block)"
[disabled]="!canBeCopiedToMarkedConnection(block)">
(click)="copyToMarkedSpot()"
[disabled]="!canBeCopiedToMarkedConnection()">
{{'COPY_TO_MARKED_SPOT'|translate}}
</button>
</li>
@@ -136,22 +137,36 @@ blocklyApp.ToolboxTreeComponent = ng.core
return this.utilsService.generateAriaLabelledByAttr(
mainLabel, secondLabel, isDisabled);
},
canBeCopiedToMarkedConnection: function(block) {
return this.clipboardService.canBeCopiedToMarkedConnection(block);
canBeCopiedToMarkedConnection: function() {
return this.clipboardService.canBeCopiedToMarkedConnection(this.block);
},
copyToWorkspace: function(block) {
var xml = Blockly.Xml.blockToDom(block);
copyToWorkspace: function() {
var xml = Blockly.Xml.blockToDom(this.block);
Blockly.Xml.domToBlock(blocklyApp.workspace, xml);
alert('Added block to workspace: ' + block.toString());
alert('Added block to workspace: ' + this.block.toString());
},
copyToClipboard: function(block) {
if (this.clipboardService) {
this.clipboardService.copy(block, true);
}
copyToClipboard: function() {
this.clipboardService.copy(this.block, true);
},
copyToMarkedSpot: function(block) {
if (this.clipboardService) {
this.clipboardService.pasteToMarkedConnection(block, true);
}
copyToMarkedSpot: function() {
// This involves two steps:
// - Put the block on the destination tree.
// - Change the current tree-level focus to the destination tree, and the
// screenreader focus for the destination tree to the block just moved.
var blockDescription = this.block.toString();
var newBlockId = this.clipboardService.pasteToMarkedConnection(
this.block);
// Invoke a digest cycle, so that the DOM settles.
var that = this;
setTimeout(function() {
var destinationTreeId = that.treeService.getTreeIdForBlock(newBlockId);
document.getElementById(destinationTreeId).focus();
that.treeService.setActiveDesc(
newBlockId + 'blockRoot', destinationTreeId);
alert('Block copied to marked spot: ' + blockDescription);
});
}
});

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

@@ -176,15 +176,18 @@ blocklyApp.WorkspaceTreeComponent = ng.core
var blockDescription = this.block.toString();
var newBlockId = this.clipboardService.pasteToMarkedConnection(
this.block, false);
this.block);
var that = this;
this.removeBlockAndSetFocus_(this.block, function() {
that.block.dispose(true);
});
// Invoke a digest cycle, so that the DOM settles.
setTimeout(function() {
var destinationTreeId = that.treeService.getTreeIdForBlock(newBlockId);
that.treeService.clearActiveDesc(destinationTreeId);
document.getElementById(destinationTreeId).focus();
that.treeService.setActiveDesc(
newBlockId + 'blockRoot', destinationTreeId);