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
135 lines
5.8 KiB
JavaScript
135 lines
5.8 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 a toolbox is rendered
|
|
* in AccessibleBlockly. Also handles any interactions with the toolbox.
|
|
* @author madeeha@google.com (Madeeha Ghori)
|
|
*/
|
|
blocklyApp.ToolboxView = ng.core
|
|
.Component({
|
|
selector: 'toolbox-view',
|
|
template: `
|
|
<h3 #toolboxTitle id="blockly-toolbox-title">Toolbox</h3>
|
|
<ol #tree id="blockly-toolbox-tree" role="group" class="blocklyTree"
|
|
*ngIf="makeArray(sightedToolbox) && makeArray(sightedToolbox).length > 0"
|
|
tabIndex="0" [attr.aria-labelledby]="toolboxTitle.id"
|
|
[attr.aria-activedescendant]="tree.getAttribute('aria-activedescendant') || tree.id + '-node0' "
|
|
(keydown)="treeService.onKeypress($event, tree)">
|
|
<li #parent [id]="idMap['Parent' + i]" role="treeitem"
|
|
[ngClass]="{blocklyHasChildren: true,
|
|
blocklyActiveDescendant: tree.getAttribute('aria-activedescendant') == idMap['Parent' + i]}"
|
|
*ngIf="toolboxHasCategories" *ngFor="#category of makeArray(sightedToolbox); #i=index"
|
|
aria-level="1" aria-selected=false>
|
|
<!-- TODO(madeeha): There seems to be some bug in Angular that makes it
|
|
access index=undefined in the ngFor loop. This causes it to throw an error once it reaches line
|
|
44. To combat this, we have added the div at line 43. Talk to fraser@.-->
|
|
<div *ngIf="category && category.attributes">
|
|
<label [id]="idMap['Label' + i]" #name>{{category.attributes.name.value}}</label>
|
|
{{labelCategory(name, i, tree)}}
|
|
<ol role="group" *ngIf="getToolboxWorkspace(category).topBlocks_.length > 0">
|
|
<toolbox-tree-view *ngFor="#block of getToolboxWorkspace(category).topBlocks_" [level]=2 [block]="block" [displayBlockMenu]="true" [clipboardService]="clipboardService"></toolbox-tree-view>
|
|
</ol>
|
|
</div>
|
|
</li>
|
|
<div *ngIf="!toolboxHasCategories">
|
|
<toolbox-tree-view *ngFor="#block of getToolboxWorkspace(toolboxCategories[0]).topBlocks_; #i=index" [level]=1 [block]="block" [displayBlockMenu]="true" [clipboardService]="clipboardService" [index]="i" [tree]="tree" [noCategories]="true"></toolbox-tree-view>
|
|
</div>
|
|
</ol>
|
|
`,
|
|
directives: [blocklyApp.ToolboxTreeView],
|
|
providers: [blocklyApp.TreeService, blocklyApp.UtilsService],
|
|
})
|
|
.Class({
|
|
constructor: [blocklyApp.TreeService, blocklyApp.UtilsService, function(_treeService, _utilsService) {
|
|
this.sightedToolbox = document.getElementById('blockly-toolbox-xml');
|
|
|
|
this.toolboxCategories = [];
|
|
this.toolboxWorkspaces = Object.create(null);
|
|
this.treeService = _treeService;
|
|
this.utilsService = _utilsService;
|
|
|
|
this.toolboxHasCategories = false;
|
|
}],
|
|
ngOnInit: function() {
|
|
var elementsNeedingIds = [];
|
|
var categories = this.makeArray(this.sightedToolbox);
|
|
if (this.toolboxHasCategories) {
|
|
for (var i = 0; i < categories.length; i++){
|
|
elementsNeedingIds.push('Parent' + i);
|
|
elementsNeedingIds.push('Label' + i);
|
|
}
|
|
this.idMap = this.utilsService.generateIds(elementsNeedingIds);
|
|
this.idMap['Parent0'] = 'blockly-toolbox-tree-node0';
|
|
}
|
|
},
|
|
labelCategory: function(label, i, tree) {
|
|
var parent = label.parentNode;
|
|
while (parent && parent.tagName != 'LI') {
|
|
parent = parent.parentNode;
|
|
}
|
|
parent.setAttribute('aria-label', label.innerText);
|
|
parent.id = 'blockly-toolbox-tree-node' + i;
|
|
if (i == 0 && tree.getAttribute('aria-activedescendant') ==
|
|
'blockly-toolbox-tree-node0') {
|
|
this.treeService.setActiveDesc(parent, tree.id);
|
|
parent.setAttribute('aria-selected', 'true');
|
|
}
|
|
},
|
|
makeArray: function(val) {
|
|
if (val) {
|
|
if (this.toolboxCategories.length) {
|
|
return this.toolboxCategories;
|
|
} else {
|
|
var categories = val.getElementsByTagName('category');
|
|
if (categories.length) {
|
|
this.toolboxHasCategories = true;
|
|
this.toolboxCategories = Array.from(categories);
|
|
return this.toolboxCategories;
|
|
}
|
|
this.toolboxHasCategories = false;
|
|
this.toolboxCategories = [Array.from(val.children)];
|
|
return this.toolboxCategories;
|
|
}
|
|
}
|
|
},
|
|
getToolboxWorkspace: function(categoryNode) {
|
|
if (categoryNode.attributes && categoryNode.attributes.name) {
|
|
var categoryName = categoryNode.attributes.name.value;
|
|
} else {
|
|
var categoryName = 'no-category';
|
|
}
|
|
if (this.toolboxWorkspaces[categoryName]) {
|
|
return this.toolboxWorkspaces[categoryName];
|
|
} else {
|
|
var categoryWorkspace = new Blockly.Workspace();
|
|
if (categoryName == 'no-category') {
|
|
for (var i = 0; i < categoryNode.length; i++) {
|
|
Blockly.Xml.domToBlock(categoryWorkspace, categoryNode[i]);
|
|
}
|
|
} else {
|
|
Blockly.Xml.domToWorkspace(categoryNode, categoryWorkspace);
|
|
}
|
|
this.toolboxWorkspaces[categoryName] = categoryWorkspace;
|
|
return this.toolboxWorkspaces[categoryName];
|
|
}
|
|
}
|
|
});
|
|
|