Rename workspace-tree to workspace-block.

This commit is contained in:
Sean Lip
2017-01-17 13:32:33 -08:00
parent ed0c9868c6
commit 4bef8cc329
3 changed files with 15 additions and 15 deletions

View File

@@ -24,8 +24,8 @@
* @author madeeha@google.com (Madeeha Ghori) * @author madeeha@google.com (Madeeha Ghori)
*/ */
blocklyApp.WorkspaceTreeComponent = ng.core.Component({ blocklyApp.WorkspaceBlockComponent = ng.core.Component({
selector: 'blockly-workspace-tree', selector: 'blockly-workspace-block',
template: ` template: `
<li [id]="idMap['blockRoot']" role="treeitem" class="blocklyHasChildren" <li [id]="idMap['blockRoot']" role="treeitem" class="blocklyHasChildren"
[attr.aria-labelledBy]="generateAriaLabelledByAttr(idMap['blockSummary'], 'blockly-translate-workspace-block')" [attr.aria-labelledBy]="generateAriaLabelledByAttr(idMap['blockSummary'], 'blockly-translate-workspace-block')"
@@ -44,10 +44,10 @@ blocklyApp.WorkspaceTreeComponent = ng.core.Component({
</blockly-field-segment> </blockly-field-segment>
</li> </li>
<blockly-workspace-tree *ngIf="blockInput.connection && blockInput.connection.targetBlock()" <blockly-workspace-block *ngIf="blockInput.connection && blockInput.connection.targetBlock()"
[block]="blockInput.connection.targetBlock()" [level]="level + 1" [block]="blockInput.connection.targetBlock()" [level]="level + 1"
[tree]="tree"> [tree]="tree">
</blockly-workspace-tree> </blockly-workspace-block>
<li #inputList [id]="idMap['inputList' + i]" role="treeitem" <li #inputList [id]="idMap['inputList' + i]" role="treeitem"
*ngIf="blockInput.connection && !blockInput.connection.targetBlock()" *ngIf="blockInput.connection && !blockInput.connection.targetBlock()"
[attr.aria-labelledBy]="generateAriaLabelledByAttr(idMap['inputMenuLabel' + i], 'blockly-submenu-indicator')" [attr.aria-labelledBy]="generateAriaLabelledByAttr(idMap['inputMenuLabel' + i], 'blockly-submenu-indicator')"
@@ -65,13 +65,13 @@ blocklyApp.WorkspaceTreeComponent = ng.core.Component({
</ol> </ol>
</li> </li>
<blockly-workspace-tree *ngIf= "block.nextConnection && block.nextConnection.targetBlock()" <blockly-workspace-block *ngIf= "block.nextConnection && block.nextConnection.targetBlock()"
[block]="block.nextConnection.targetBlock()" [block]="block.nextConnection.targetBlock()"
[level]="level" [tree]="tree"> [level]="level" [tree]="tree">
</blockly-workspace-tree> </blockly-workspace-block>
`, `,
directives: [blocklyApp.FieldSegmentComponent, ng.core.forwardRef(function() { directives: [blocklyApp.FieldSegmentComponent, ng.core.forwardRef(function() {
return blocklyApp.WorkspaceTreeComponent; return blocklyApp.WorkspaceBlockComponent;
})], })],
inputs: ['block', 'level', 'tree', 'isTopLevel'], inputs: ['block', 'level', 'tree', 'isTopLevel'],
pipes: [blocklyApp.TranslatePipe] pipes: [blocklyApp.TranslatePipe]

View File

@@ -37,8 +37,8 @@ blocklyApp.WorkspaceComponent = ng.core.Component({
[attr.aria-labelledby]="workspaceTitle.id" [attr.aria-labelledby]="workspaceTitle.id"
(keydown)="onKeypress($event, tree)" (keydown)="onKeypress($event, tree)"
(focus)="speakLocation(i)"> (focus)="speakLocation(i)">
<blockly-workspace-tree [level]="0" [block]="block" [tree]="tree" [isTopLevel]="true"> <blockly-workspace-block [level]="0" [block]="block" [tree]="tree" [isTopLevel]="true">
</blockly-workspace-tree> </blockly-workspace-block>
</ol> </ol>
<span *ngIf="workspace.topBlocks_.length === 0"> <span *ngIf="workspace.topBlocks_.length === 0">
@@ -55,7 +55,7 @@ blocklyApp.WorkspaceComponent = ng.core.Component({
</div> </div>
</div> </div>
`, `,
directives: [blocklyApp.WorkspaceTreeComponent], directives: [blocklyApp.WorkspaceBlockComponent],
pipes: [blocklyApp.TranslatePipe] pipes: [blocklyApp.TranslatePipe]
}) })
.Class({ .Class({

View File

@@ -32,7 +32,7 @@
<script src="../../accessible/block-options-modal.component.js"></script> <script src="../../accessible/block-options-modal.component.js"></script>
<script src="../../accessible/toolbox-modal.component.js"></script> <script src="../../accessible/toolbox-modal.component.js"></script>
<script src="../../accessible/sidebar.component.js"></script> <script src="../../accessible/sidebar.component.js"></script>
<script src="../../accessible/workspace-tree.component.js"></script> <script src="../../accessible/workspace-block.component.js"></script>
<script src="../../accessible/workspace.component.js"></script> <script src="../../accessible/workspace.component.js"></script>
<script src="../../accessible/app.component.js"></script> <script src="../../accessible/app.component.js"></script>