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

Further cleanup and removal of unnecessary functions. Pull some strings out for i18n.

Browse Source
This commit is contained in:
Sean Lip
2017-01-18 17:45:15 -08:00
parent d2bfd134b6
commit 59b074d19f
7 changed files with 27 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,7 +73,7 @@ blocklyApp.WorkspaceBlockComponent = ng.core.Component({
directives: [blocklyApp.FieldSegmentComponent, ng.core.forwardRef(function() {
return blocklyApp.WorkspaceBlockComponent;
})],
inputs: ['block', 'level', 'tree', 'isTopLevel'],
inputs: ['block', 'level', 'tree'],
pipes: [blocklyApp.TranslatePipe]
})
.Class({
@@ -176,10 +176,10 @@ blocklyApp.WorkspaceBlockComponent = ng.core.Component({
// Angular change detection.)
var that = this;
setTimeout(function() {
if (that.tree && that.isTopLevel && !that.tree.id) {
that.tree.id = that.utilsService.generateUniqueId();
if (that.tree && that.level === 0 && !that.tree.id) {
that.tree.id = 'blockly-' + Blockly.utils.genUid();
}
if (that.tree && that.isTopLevel &&
if (that.tree && that.level === 0 &&
!that.treeService.getActiveDescId(that.tree.id)) {
that.treeService.setActiveDesc(that.idMap['blockRoot'], that.tree.id);
}
@@ -198,8 +198,7 @@ blocklyApp.WorkspaceBlockComponent = ng.core.Component({
}
},
generateAriaLabelledByAttr: function(mainLabel, secondLabel) {
return this.utilsService.generateAriaLabelledByAttr(
mainLabel, secondLabel);
return mainLabel + (secondLabel ? ' ' + secondLabel : '');
},
getBlockNeededLabel: function(blockInput) {
// The input type name, or 'any' if any official input type qualifies.