scratchfoundation/scratch-blocks
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-blocks.git synced 2025-08-28 22:10:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix screenreader focus behaviour when pasting blocks.

Browse source
This commit is contained in:
Sean Lip 2016-07-22 17:49:11 -07:00
parent 9e11acda49
commit 0e7e3547b9
1 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

38
accessible/workspace-tree.component.js
View file

@ -149,24 +149,30 @@ blocklyApp.WorkspaceTreeComponent = ng.core
alert('Block deleted: ' + blockDescription);
},
pasteToConnection_: function(connection) {
// 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 newBlockId = null;
// 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()) {
newBlockId = this.clipboardService.pasteFromClipboard(
connection.targetConnection);
} else {
newBlockId = this.clipboardService.pasteFromClipboard(connection);
}
// Invoke a digest cycle, so that the DOM settles.
var that = this;
this.treeService.runWhilePreservingFocus(function() {
// 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.
var newBlockId = null;
if (connection.type == Blockly.PREVIOUS_STATEMENT &&
connection.isConnected()) {
newBlockId = that.clipboardService.pasteFromClipboard(
connection.targetConnection);
} else {
newBlockId = that.clipboardService.pasteFromClipboard(connection);
}
setTimeout(function() {
// Move the screenreader focus to the newly-pasted block.
that.treeService.clearActiveDesc(that.tree.id);
that.treeService.setActiveDesc(newBlockId + 'blockRoot', that.tree.id);
}, this.tree.id);
});
},
moveToMarkedSpot_: function() {
// This involves three steps:
@ -282,7 +288,7 @@ blocklyApp.WorkspaceTreeComponent = ng.core
baseIdKey: 'paste',
translationIdForText: 'PASTE',
action: function(connection) {
that.clipboardService.pasteFromClipboard(connection);
that.pasteToConnection_(connection);
},
isDisabled: function(connection) {
return !that.isCompatibleWithClipboard(connection);