{"push_id":1126991117,"size":1,"distinct_size":1,"ref":"refs/heads/develop","head":"b2e7bd9ba5834ec65fd508cc214f16c0f1354673","before":"c414a52b04056325e2bf551b9cf63efb46f8bd96","commits":[{"sha":"b2e7bd9ba5834ec65fd508cc214f16c0f1354673","author":{"email":"96113f0dc4d43984df7f1ec22a40b4dd44682151@gmail.com","name":"Tim Mickel"},"message":"Merge upstream may 24 (#352)\n\n* Localisation updates from https://translatewiki.net.\r\n\r\n* Initialize generated JS and Dart variables in one line.\r\n\r\n* proxy option for build.py\r\n\r\n* Localisation updates from https://translatewiki.net.\r\n\r\n* Revert \"proxy option for build.py\"\r\n\r\n* Prevent sounds from playing on top of each other.\r\n\r\n* Routine recompile.\r\n\r\n* Remove sound and animation on delete during undo/redo.\r\n\r\n* Accessible demo (#373)\r\n\r\n* adding a folder in demos for blind and setting up the package.json file for development. Adding package.json to .gitignore\r\n\r\n* removing gitignore~ file\r\n\r\n* 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.\r\n\r\n* adding an index file that was being ignored by .gitignore\r\n\r\n* adding required angular files and libraries previously ignored by git add --a for some unknown reason.\r\n\r\n* starting work on toolbox\r\n\r\n* got workspace and toolbox connected. Copy to workspace annd copy to clipboard working at 80%.\r\n\r\n* cleaning up autogenerated files\r\n\r\n* adding my own files. Not sure why the test files are being added.\r\n\r\n* cleaning up comments\r\n\r\n* 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.\r\n\r\n* getting rid of unnecessary html_formatter file\r\n\r\n* removing merge conflicts\r\n\r\n* cleaned up comments\r\n\r\n* 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\r\n\r\n* removing lint files that shouldn't be tracked.\r\n\r\n* Made the clipboard a service instead of multiple pieces embedded within the app. Not sold on the name ClipboardService. Open to suggestions.\r\n\r\n* syncing up demo updates\r\n\r\n* adding insert block menus above and below appropriate blocks.\r\n\r\n* hacky version of getting code to run.\r\n\r\n* changing toolbox to be a menu. making both the toolbox and workspace ordered lists\r\n\r\n* adding new folder dev-old containing a version of blind blockly that uses nested lists for the toolbox\r\n\r\n* getting rid of menubar experiment\r\n\r\n* adding treeview shenanigans part 1\r\n\r\n* adding treeview experiment page and finishing up treeview.\r\n\r\n* getting a treeview implementation working in the toolbox\r\n\r\n* creating a fishfood folder for fishfood development\r\n\r\n* making first level of fishfood\r\n\r\n* fixing something\r\n\r\n* adding index file for fishfood\r\n\r\n* beginning merging the treeview system.\r\n\r\n* creating two treeviews\r\n\r\n* fishfood level 1 without working music blocks\r\n\r\n* fixes to treeview navigation\r\n\r\n* final fishfood features done\r\n\r\n* adding support for toolboxes without categories\r\n\r\n* beginning integration of Sean's new music code\r\n\r\n* adding Sean's music blocks and beginning music_player integration.\r\n\r\n* merged Sean's music block code into fishfood\r\n\r\n* merged Sean's music code and fixed treeview bug with toolbox when no categories\r\n\r\n* adding blank_demo\r\n\r\n* fixing tab navigation.\r\n\r\n* fixing bug with shift-tab. New bug found in alt+tab not opening dropdown?\r\n\r\n* fixing labels\r\n\r\n* fixing bugs and finding more.\r\n\r\n* removing dropdowns in favor of buttons part 1. Still need to change field options.\r\n\r\n* index.html for blank_demo\r\n\r\n* beginning cleanup\r\n\r\n* adding blockly- prefix to label ids.\r\n\r\n* integrating AccessibleBlockly with Blockly library.\r\n\r\n* remove closure library\r\n\r\n* removing testing files that aren't in develop\r\n\r\n* removing all demo stuff for a later pull request\r\n\r\n* removing gitignore file that doesn't exist in developer branch\r\n\r\n* syncing with develop branch files\r\n\r\n* removing music files from this pull request\r\n\r\n* doing some lint cleanup\r\n\r\n* rolling back accidental package.json change\r\n\r\n* removing var blocklyApp = blocklyApp || {} from each extraneous file\r\n\r\n* adding last debug statement\r\n\r\n* changed name of inputType function\r\n\r\n* renaming _service arguments\r\n\r\n* fixing function names\r\n\r\n* fixing all comments.\r\n\r\n* fixing minor comments\r\n\r\n* renaming variables, etc\r\n\r\n* fixing bugs that break demo. Adding the run code and clear workspace buttons back to the workspaceview as their current position breaks tab navigation.\r\n\r\n* fixing minor comments\r\n\r\n* fixing function names, etc.\r\n\r\n* adding comments to getInputTypeLabel function\r\n\r\n* removing addClass() calls from the template\r\n\r\n* small change to clipboardService\r\n\r\n* splitting getCategoryDependantId into two functions: getCategoryId and setActiveDesc\r\n\r\n* fixing minor bug with last commit\r\n\r\n* using conditional attributes to remove setActiveAttributes function from treeService and do same work in template.\r\n\r\n* deleting unnecessary comment created in previous commit.\r\n\r\n* adding a utilsService to remove duplicated code.\r\n\r\n* changing function names in utilsService\r\n\r\n* changing delete to [delete] to allow HTMLText functions to return an empty string instead of undefined. Also renaming concatStringWithSpaces to generateAriaLabelledByAttr\r\n\r\n* 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.\r\n\r\n* fixing small bug with tree service left arrow: was throwing an error when you can't go any further left.\r\n\r\n* reformatting html to make it easier to read.\r\n\r\n* moving from importing the xml file to using an xml toolbox in the demo.\r\n\r\n* fixing minor bugs and removing code relevant only to the music game.\r\n\r\n* minor fixes\r\n\r\n* adding alerts to copy, paste, and mark actions. renaming blocklyApp.TreeView to blocklyApp.WorkspaceTreeView\r\n\r\n* Beginning to add Blockly.msg strings.\r\n\r\n* making sure index file is being tracked\r\n\r\n* adding all demo bits\r\n\r\n* removing demo files from this pull request\r\n\r\n* fixing providers, some linting, and removing getInfo() function.\r\n\r\n* adding small todo comment for sll@\r\n\r\n* adding minimal blockly accessible demo\r\n\r\n* removing unnecessary files\r\n\r\n* putting package file back\r\n\r\n* fixing package file\r\n\r\n* fixing msg file\r\n\r\n* fixing boot.js file\r\n\r\n* fixing boot.js file\r\n\r\n* fixing indentation on boot\r\n\r\n* fixing indentation on index file.\r\n\r\n* AccessibleBlockly (#354)\r\n\r\n* adding a folder in demos for blind and setting up the package.json file for development. Adding package.json to .gitignore\r\n\r\n* removing gitignore~ file\r\n\r\n* 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.\r\n\r\n* adding an index file that was being ignored by .gitignore\r\n\r\n* adding required angular files and libraries previously ignored by git add --a for some unknown reason.\r\n\r\n* starting work on toolbox\r\n\r\n* got workspace and toolbox connected. Copy to workspace annd copy to clipboard working at 80%.\r\n\r\n* cleaning up autogenerated files\r\n\r\n* adding my own files. Not sure why the test files are being added.\r\n\r\n* cleaning up comments\r\n\r\n* 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.\r\n\r\n* getting rid of unnecessary html_formatter file\r\n\r\n* removing merge conflicts\r\n\r\n* cleaned up comments\r\n\r\n* 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\r\n\r\n* removing lint files that shouldn't be tracked.\r\n\r\n* Made the clipboard a service instead of multiple pieces embedded within the app. Not sold on the name ClipboardService. Open to suggestions.\r\n\r\n* syncing up demo updates\r\n\r\n* adding insert block menus above and below appropriate blocks.\r\n\r\n* hacky version of getting code to run.\r\n\r\n* changing toolbox to be a menu. making both the toolbox and workspace ordered lists\r\n\r\n* adding new folder dev-old containing a version of blind blockly that uses nested lists for the toolbox\r\n\r\n* getting rid of menubar experiment\r\n\r\n* adding treeview shenanigans part 1\r\n\r\n* adding treeview experiment page and finishing up treeview.\r\n\r\n* getting a treeview implementation working in the toolbox\r\n\r\n* creating a fishfood folder for fishfood development\r\n\r\n* making first level of fishfood\r\n\r\n* fixing something\r\n\r\n* adding index file for fishfood\r\n\r\n* beginning merging the treeview system.\r\n\r\n* creating two treeviews\r\n\r\n* fishfood level 1 without working music blocks\r\n\r\n* fixes to treeview navigation\r\n\r\n* final fishfood features done\r\n\r\n* adding support for toolboxes without categories\r\n\r\n* beginning integration of Sean's new music code\r\n\r\n* adding Sean's music blocks and beginning music_player integration.\r\n\r\n* merged Sean's music block code into fishfood\r\n\r\n* merged Sean's music code and fixed treeview bug with toolbox when no categories\r\n\r\n* adding blank_demo\r\n\r\n* fixing tab navigation.\r\n\r\n* fixing bug with shift-tab. New bug found in alt+tab not opening dropdown?\r\n\r\n* fixing labels\r\n\r\n* fixing bugs and finding more.\r\n\r\n* removing dropdowns in favor of buttons part 1. Still need to change field options.\r\n\r\n* index.html for blank_demo\r\n\r\n* beginning cleanup\r\n\r\n* adding blockly- prefix to label ids.\r\n\r\n* integrating AccessibleBlockly with Blockly library.\r\n\r\n* remove closure library\r\n\r\n* removing testing files that aren't in develop\r\n\r\n* removing all demo stuff for a later pull request\r\n\r\n* removing gitignore file that doesn't exist in developer branch\r\n\r\n* syncing with develop branch files\r\n\r\n* removing music files from this pull request\r\n\r\n* doing some lint cleanup\r\n\r\n* rolling back accidental package.json change\r\n\r\n* removing var blocklyApp = blocklyApp || {} from each extraneous file\r\n\r\n* adding last debug statement\r\n\r\n* changed name of inputType function\r\n\r\n* renaming _service arguments\r\n\r\n* fixing function names\r\n\r\n* fixing all comments.\r\n\r\n* fixing minor comments\r\n\r\n* renaming variables, etc\r\n\r\n* fixing bugs that break demo. Adding the run code and clear workspace buttons back to the workspaceview as their current position breaks tab navigation.\r\n\r\n* fixing minor comments\r\n\r\n* fixing function names, etc.\r\n\r\n* adding comments to getInputTypeLabel function\r\n\r\n* removing addClass() calls from the template\r\n\r\n* small change to clipboardService\r\n\r\n* splitting getCategoryDependantId into two functions: getCategoryId and setActiveDesc\r\n\r\n* fixing minor bug with last commit\r\n\r\n* using conditional attributes to remove setActiveAttributes function from treeService and do same work in template.\r\n\r\n* deleting unnecessary comment created in previous commit.\r\n\r\n* adding a utilsService to remove duplicated code.\r\n\r\n* changing function names in utilsService\r\n\r\n* changing delete to [delete] to allow HTMLText functions to return an empty string instead of undefined. Also renaming concatStringWithSpaces to generateAriaLabelledByAttr\r\n\r\n* 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.\r\n\r\n* fixing small bug with tree service left arrow: was throwing an error when you can't go any further left.\r\n\r\n* reformatting html to make it easier to read.\r\n\r\n* moving from importing the xml file to using an xml toolbox in the demo.\r\n\r\n* fixing minor bugs and removing code relevant only to the music game.\r\n\r\n* minor fixes\r\n\r\n* adding alerts to copy, paste, and mark actions. renaming blocklyApp.TreeView to blocklyApp.WorkspaceTreeView\r\n\r\n* Beginning to add Blockly.msg strings.\r\n\r\n* making sure index file is being tracked\r\n\r\n* adding all demo bits\r\n\r\n* removing demo files from this pull request\r\n\r\n* fixing providers, some linting, and removing getInfo() function.\r\n\r\n* adding small todo comment for sll@\r\n\r\n* adding minimal Accessible Blockly demo\r\n\r\n* removing demo: accidentally committed to wrong branch\r\n\r\n* fixing Blockly.Msg string bugs\r\n\r\n* fixing TODOs\r\n\r\n* package file changed by an automerge. Changing back.\r\n\r\n* addressing sll's comments. Creating shim for utilsService functions.\r\n\r\n* fixing comments, changing fieldview to deal with this.field.\r\n\r\n* fixing clipboard service bug\r\n\r\n* fixing focus bug when editing a text input.\r\n\r\n* fixed clipboard bug and added README\r\n\r\n* fixing workspaceview not to implement on runCode() function and adding note to README\r\n\r\n* Cleanup accessible Blockly.\r\n\r\n* Recompile May 24","distinct":true,"url":"https://api.github.com/repos/LLK/scratch-blocks/commits/b2e7bd9ba5834ec65fd508cc214f16c0f1354673"}]}
{"actor":{"display_login":"tmickel"}}