mirror of
https://github.com/google/blockly.git
synced 2026-01-07 17:10:11 +01:00
* adding a folder in demos for blind and setting up the package.json file for development. Adding package.json to .gitignore
* removing gitignore~ file
* copied blind blockly demo code over. set up a new dev environment. Up for review: the blind blockly demo code. Much of the drop downs don't actually do anything, but a general look at the way angular is used would be helpful in shaping future development.
* adding an index file that was being ignored by .gitignore
* adding required angular files and libraries previously ignored by git add --a for some unknown reason.
* starting work on toolbox
* got workspace and toolbox connected. Copy to workspace annd copy to clipboard working at 80%.
* cleaning up autogenerated files
* adding my own files. Not sure why the test files are being added.
* cleaning up comments
* removed empty html_formatter.html file from project and put on git ignore list. The file is used on my end to help with formatting the html in javascript files.
* getting rid of unnecessary html_formatter file
* removing merge conflicts
* cleaned up comments
* cleaned up comments, organized file structure, made ToolboxXML a file that can be changed by other developers porting this code, added copyright and file summaries to js files, linted files, moved third party libraries to lib folder
* removing lint files that shouldn't be tracked.
* Made the clipboard a service instead of multiple pieces embedded within the app. Not sold on the name ClipboardService. Open to suggestions.
* syncing up demo updates
* adding insert block menus above and below appropriate blocks.
* hacky version of getting code to run.
* changing toolbox to be a menu. making both the toolbox and workspace ordered lists
* adding new folder dev-old containing a version of blind blockly that uses nested lists for the toolbox
* getting rid of menubar experiment
* adding treeview shenanigans part 1
* adding treeview experiment page and finishing up treeview.
* getting a treeview implementation working in the toolbox
* creating a fishfood folder for fishfood development
* making first level of fishfood
* fixing something
* adding index file for fishfood
* beginning merging the treeview system.
* creating two treeviews
* fishfood level 1 without working music blocks
* fixes to treeview navigation
* final fishfood features done
* adding support for toolboxes without categories
* beginning integration of Sean's new music code
* adding Sean's music blocks and beginning music_player integration.
* merged Sean's music block code into fishfood
* merged Sean's music code and fixed treeview bug with toolbox when no categories
* adding blank_demo
* fixing tab navigation.
* fixing bug with shift-tab. New bug found in alt+tab not opening dropdown?
* fixing labels
* fixing bugs and finding more.
* removing dropdowns in favor of buttons part 1. Still need to change field options.
* index.html for blank_demo
* beginning cleanup
* adding blockly- prefix to label ids.
* integrating AccessibleBlockly with Blockly library.
* remove closure library
* removing testing files that aren't in develop
* removing all demo stuff for a later pull request
* removing gitignore file that doesn't exist in developer branch
* syncing with develop branch files
* removing music files from this pull request
* doing some lint cleanup
* rolling back accidental package.json change
* removing var blocklyApp = blocklyApp || {} from each extraneous file
* adding last debug statement
* changed name of inputType function
* renaming _service arguments
* fixing function names
* fixing all comments.
* fixing minor comments
* renaming variables, etc
* fixing bugs that break demo. Adding the run code and clear workspace buttons back to the workspaceview as their current position breaks tab navigation.
* fixing minor comments
* fixing function names, etc.
* adding comments to getInputTypeLabel function
* removing addClass() calls from the template
* small change to clipboardService
* splitting getCategoryDependantId into two functions: getCategoryId and setActiveDesc
* fixing minor bug with last commit
* using conditional attributes to remove setActiveAttributes function from treeService and do same work in template.
* deleting unnecessary comment created in previous commit.
* adding a utilsService to remove duplicated code.
* changing function names in utilsService
* changing delete to [delete] to allow HTMLText functions to return an empty string instead of undefined. Also renaming concatStringWithSpaces to generateAriaLabelledByAttr
* generating ids in ngOnInit instead of on the fly, allowing us to use [attr.aria-labelledBy] in the template instead of using setLabelledBy(element). Deleting function utilsService.setLabelledBy.
* fixing small bug with tree service left arrow: was throwing an error when you can't go any further left.
* reformatting html to make it easier to read.
* moving from importing the xml file to using an xml toolbox in the demo.
* fixing minor bugs and removing code relevant only to the music game.
* minor fixes
* adding alerts to copy, paste, and mark actions. renaming blocklyApp.TreeView to blocklyApp.WorkspaceTreeView
* Beginning to add Blockly.msg strings.
* making sure index file is being tracked
* adding all demo bits
* removing demo files from this pull request
* fixing providers, some linting, and removing getInfo() function.
* adding small todo comment for sll@
* adding minimal Accessible Blockly demo
* removing demo: accidentally committed to wrong branch
* fixing Blockly.Msg string bugs
* fixing TODOs
* package file changed by an automerge. Changing back.
* addressing sll's comments. Creating shim for utilsService functions.
* fixing comments, changing fieldview to deal with this.field.
* fixing clipboard service bug
* fixing focus bug when editing a text input.
* fixed clipboard bug and added README
* fixing workspaceview not to implement on runCode() function and adding note to README
160 lines
8.4 KiB
JavaScript
160 lines
8.4 KiB
JavaScript
/**
|
|
* AccessibleBlockly
|
|
*
|
|
* Copyright 2016 Google Inc.
|
|
* https://developers.google.com/blockly/
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the 'License');
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an 'AS IS' BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
/**
|
|
* @fileoverview Angular2 Component that details how blocks are
|
|
* rendered in the toolbox in AccessibleBlockly. Also handles any interactions
|
|
* with the blocks.
|
|
* @author madeeha@google.com (Madeeha Ghori)
|
|
*/
|
|
blocklyApp.ToolboxTreeView = ng.core
|
|
.Component({
|
|
selector: 'toolbox-tree-view',
|
|
template: `
|
|
<li #parentList [id]="idMap['parentList']" role="treeitem"
|
|
[ngClass]="{blocklyHasChildren: displayBlockMenu || block.inputList.length > 0, blocklyActiveDescendant: index == 0 && noCategories}"
|
|
[attr.aria-labelledBy]="generateAriaLabelledByAttr('blockly-block-summary', idMap['blockSummaryLabel'])"
|
|
[attr.aria-selected]="index == 0 && tree.getAttribute('aria-activedescendant') == 'blockly-toolbox-tree-node0'"
|
|
[attr.aria-level]="level">
|
|
{{setActiveDesc(parentList)}}
|
|
<label #blockSummaryLabel [id]="idMap['blockSummaryLabel']">{{block.toString()}}</label>
|
|
<ol role="group" *ngIf="displayBlockMenu || block.inputList.length > 0" [attr.aria-level]="level+1">
|
|
<li #listItem [attr.aria-labelledBy]="generateAriaLabelledByAttr('blockly-block-menu', idMap['blockSummaryLabel'])" class="blocklyHasChildren" [id]="idMap['listItem']" *ngIf="displayBlockMenu" role="treeitem" aria-selected=false [attr.aria-level]="level+1">
|
|
<label #label [id]="idMap['label']">{{stringMap['BLOCK_ACTION_LIST']}}</label>
|
|
<ol role="group" *ngIf="displayBlockMenu" [attr.aria-level]="level+2">
|
|
<li #workspaceCopy [id]="idMap['workspaceCopy']" role="treeitem"
|
|
[attr.aria-labelledBy]="generateAriaLabelledByAttr(idMap['workspaceCopyButton'], 'blockly-button')"
|
|
[attr.aria-level]="level+2" aria-selected=false>
|
|
<button #workspaceCopyButton [id]="idMap['workspaceCopyButton']"
|
|
(click)="copyToWorkspace(block)">{{stringMap['COPY_TO_WORKSPACE']}}</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)">{{stringMap['COPY_TO_CLIPBOARD']}}</button>
|
|
</li>
|
|
<li #sendToSelected [id]="idMap['sendToSelected']" role="treeitem"
|
|
[attr.aria-labelledBy]="generateAriaLabelledByAttr(idMap['sendToSelectedButton'], 'blockly-button', utilsService.getMarkedBlockCompatibilityHTMLText(clipboardService.isBlockCompatibleWithMarkedConnection(block)))"
|
|
[attr.aria-level]="level+2" aria-selected=false>
|
|
<button #sendToSelectedButton [id]="idMap['sendToSelectedButton']" (click)="copyToMarked(block)"
|
|
[disabled]="getMarkedBlockCompatibilityHTMLText(clipboardService.isBlockCompatibleWithMarkedConnection(block))">
|
|
{{stringMap['COPY_TO_MARKED_SPOT']}}</button>
|
|
</li>
|
|
</ol>
|
|
</li>
|
|
<div *ngFor="#inputBlock of block.inputList; #i=index">
|
|
<field-view *ngFor="#field of inputBlock.fieldRow; #j=index" [attr.aria-level]="level+1" [field]="field" [level]="level+1"></field-view>
|
|
<toolbox-tree-view *ngIf="inputBlock.connection && inputBlock.connection.targetBlock()" [block]="inputBlock.connection.targetBlock()" [displayBlockMenu]="false" [level]="level+1"></toolbox-tree-view>
|
|
<li #listItem1 [id]="idMap['listItem' + i]" role="treeitem"
|
|
*ngIf="inputBlock.connection && !inputBlock.connection.targetBlock()"
|
|
[attr.aria-labelledBy]="generateAriaLabelledByAttr('blockly-argument-text', idMap['listItem' + i + 'Label'])"
|
|
[attr.aria-level]="level+1" aria-selected=false>
|
|
<!--TODO(madeeha): i18n here will need to happen in a different way due to the way grammar changes based on language.-->
|
|
<label #label [id]="idMap['listItem' + i + 'Label']">{{utilsService.getInputTypeLabel(inputBlock.connection)}} {{utilsService.getBlockTypeLabel(inputBlock)}} needed:</label>
|
|
</li>
|
|
</div>
|
|
</ol>
|
|
</li>
|
|
<toolbox-tree-view *ngIf= "block.nextConnection && block.nextConnection.targetBlock()" [level]="level" [block]="block.nextConnection.targetBlock()" [displayBlockMenu]="false"></toolbox-tree-view>
|
|
`,
|
|
directives: [ng.core.forwardRef(
|
|
function() { return blocklyApp.ToolboxTreeView; }),
|
|
blocklyApp.FieldView],
|
|
inputs: ['block', 'displayBlockMenu', 'level', 'index', 'tree', 'noCategories'],
|
|
providers: [blocklyApp.TreeService, blocklyApp.UtilsService],
|
|
})
|
|
.Class({
|
|
constructor: [blocklyApp.ClipboardService, blocklyApp.TreeService,
|
|
blocklyApp.UtilsService,
|
|
function(_clipboardService, _treeService, _utilsService) {
|
|
this.infoBlocks = Object.create(null);
|
|
this.clipboardService = _clipboardService;
|
|
this.treeService = _treeService;
|
|
this.utilsService = _utilsService;
|
|
this.stringMap = {
|
|
'BLOCK_ACTION_LIST': Blockly.Msg.BLOCK_ACTION_LIST,
|
|
'COPY_TO_CLIPBOARD': Blockly.Msg.COPY_TO_CLIPBOARD,
|
|
'COPY_TO_WORKSPACE': Blockly.Msg.COPY_TO_WORKSPACE,
|
|
'COPY_TO_MARKED_SPOT': Blockly.Msg.COPY_TO_MARKED_SPOT,
|
|
};
|
|
}],
|
|
ngOnInit: function() {
|
|
var elementsNeedingIds = ['blockSummaryLabel'];
|
|
if (this.displayBlockMenu || this.block.inputList.length){
|
|
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);
|
|
elementsNeedingIds.push('listItem' + i + 'Label')
|
|
}
|
|
this.idMap = this.utilsService.generateIds(elementsNeedingIds);
|
|
if (this.index == 0 && this.noCategories) {
|
|
this.idMap['parentList'] = 'blockly-toolbox-tree-node0';
|
|
} else {
|
|
this.idMap['parentList'] = this.utilsService.generateUniqueId();
|
|
}
|
|
},
|
|
getMarkedBlockCompatibilityHTMLText: function(isCompatible) {
|
|
return this.utilsService.getMarkedBlockCompatibilityHTMLText(isCompatible);
|
|
},
|
|
generateAriaLabelledByAttr: function() {
|
|
return this.utilsService.generateAriaLabelledByAttr.apply(this,arguments);
|
|
},
|
|
setActiveDesc: function(parentList) {
|
|
// If this is the first child of the toolbox and the
|
|
// current active descendant of the tree is this child,
|
|
// then set the active descendant stored in the treeService.
|
|
if (this.index == 0 && this.tree.getAttribute('aria-activedescendant') ==
|
|
'blockly-toolbox-tree-node0') {
|
|
this.treeService.setActiveDesc(parentList, this.tree.id);
|
|
}
|
|
},
|
|
addClass: function(node, classText) {
|
|
// Ensure that node doesn't have class already in it.
|
|
var classList = (node.className || '').split(' ');
|
|
var canAdd = classList.indexOf(classText) == -1;
|
|
// Add class if it doesn't.
|
|
if (canAdd) {
|
|
if (classList.length) {
|
|
node.className += ' ' + classText;
|
|
} else {
|
|
node.className = classText;
|
|
}
|
|
}
|
|
},
|
|
copyToWorkspace: function(block) {
|
|
var xml = Blockly.Xml.blockToDom(block);
|
|
Blockly.Xml.domToBlock(blocklyApp.workspace, xml);
|
|
alert('Added block to workspace: ' + block.toString());
|
|
},
|
|
copyToClipboard: function(block) {
|
|
if (this.clipboardService) {
|
|
this.clipboardService.copy(block, true);
|
|
}
|
|
},
|
|
copyToMarked: function(block) {
|
|
if (this.clipboardService) {
|
|
this.clipboardService.pasteToMarkedConnection(block);
|
|
}
|
|
}
|
|
});
|