diff --git a/accessible/toolbox-tree.component.js b/accessible/toolbox-tree.component.js
index 40e28df87..948388c1b 100644
--- a/accessible/toolbox-tree.component.js
+++ b/accessible/toolbox-tree.component.js
@@ -29,11 +29,11 @@ blocklyApp.ToolboxTreeComponent = ng.core
selector: 'blockly-toolbox-tree',
template: `
0, blocklyActiveDescendant: index == 0 && noCategories}"
+ [ngClass]="{blocklyHasChildren: displayBlockMenu, blocklyActiveDescendant: index == 0 && noCategories}"
[attr.aria-labelledBy]="generateAriaLabelledByAttr('blockly-block-summary', idMap['blockSummaryLabel'])"
[attr.aria-level]="level">
- 0">
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -114,16 +93,11 @@ blocklyApp.ToolboxTreeComponent = ng.core
}],
ngOnInit: function() {
var elementsNeedingIds = ['blockSummaryLabel'];
- if (this.displayBlockMenu || this.block.inputList.length){
+ if (this.displayBlockMenu) {
elementsNeedingIds = elementsNeedingIds.concat(['listItem', 'label',
'workspaceCopy', 'workspaceCopyButton', 'blockCopy',
'blockCopyButton', 'sendToSelected', 'sendToSelectedButton']);
}
- for (var i = 0; i < this.block.inputList.length; i++){
- elementsNeedingIds.push(
- 'listItem' + i, 'inputList' + i, 'fieldLabel' + i,
- 'inputListLabel' + i);
- }
this.idMap = this.utilsService.generateIds(elementsNeedingIds);
if (this.isTopLevel) {
this.idMap['parentList'] = 'blockly-toolbox-tree-node0';