Commit graph

135 commits

Author SHA1 Message Date
Andrew n marshall
592b2e1a51 Updating URLs to reflect new docs. ()
* Updating URLs to reflect new docs. Removing -blockly in URLs.

* Rebuilt.
2016-06-14 10:15:35 -07:00
Rachel Fenichel
53d9c6b351 Merge branch 'develop' of https://github.com/google/blockly into feature/pull_upstream_6_01 2016-06-06 11:14:48 -07:00
Neil Fraser
57131165b0 Routine recompile 2016-06-03 16:12:59 -07:00
Neil Fraser
6f12c69500 Routine recompile. 2016-05-25 15:44:44 -07:00
Tim Mickel
b2e7bd9ba5 Merge upstream may 24 ()
* Localisation updates from https://translatewiki.net.

* Initialize generated JS and Dart variables in one line.

* proxy option for build.py

* Localisation updates from https://translatewiki.net.

* Revert "proxy option for build.py"

* Prevent sounds from playing on top of each other.

* Routine recompile.

* Remove sound and animation on delete during undo/redo.

* Accessible demo ()

* 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 blockly accessible demo

* removing unnecessary files

* putting package file back

* fixing package file

* fixing msg file

* fixing boot.js file

* fixing boot.js file

* fixing indentation on boot

* fixing indentation on index file.

* AccessibleBlockly ()

* 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

* Cleanup accessible Blockly.

* Recompile May 24
2016-05-24 14:44:04 -04:00
Neil Fraser
2a2a6695da Routine recompile. 2016-05-21 05:56:49 -07:00
Neil Fraser
29e10e0976 Routine recompile. 2016-05-14 03:50:35 -07:00
Neil Fraser
e69ddf9cd2 Routine recompile. 2016-05-10 17:22:17 -07:00
Dan LaLiberte
55eba0a39b Rebuild, add lists_sort block to demos/code/index.html 2016-05-06 11:14:23 -04:00
Dan LaLiberte
c1cfec8dbd Add lists_sort block. 2016-05-04 17:03:24 -04:00
Neil Fraser
ea71cec0c7 Trivial blocks only inherit tooltip from parent if on external inputs.
Recompile.
2016-05-03 17:49:10 -07:00
Neil Fraser
9f260501fe Remove duplicate getBlockById function. 2016-04-18 03:14:55 -07:00
Neil Fraser
83c04c474a Merge branch 'master' into develop 2016-04-15 23:46:06 -07:00
Neil Fraser
e162a6236a Merge branch 'pr/260'
# Conflicts:
#	core/workspace_svg.js
2016-04-15 23:23:06 -07:00
Neil Fraser
8c3de3a581 Routine recompile. 2016-04-14 00:29:13 -07:00
stefan
8aa0196ded broken url, punctuation, grammar fixes 2016-04-10 14:03:59 +02:00
Neil Fraser
2d696aa731 Normalize order of languages. 2016-04-08 22:56:42 -07:00
Neil Fraser
dd219d6f9a Routine recompile. 2016-04-07 14:40:51 -07:00
Neil Fraser
77f0936b08 Routine recompile. 2016-04-04 14:56:11 -07:00
Neil Fraser
f527c20c90 Add missing Klingon messages. 2016-04-03 15:45:38 -07:00
Neil Fraser
b7f73d60bb Routine recompile. 2016-03-31 14:19:34 -07:00
Neil Fraser
f549744bf0 Recompile. 2016-03-28 15:41:05 -07:00
Neil Fraser
6ae436a153 Add undo/redo context menu options on workspace. 2016-03-17 14:44:26 -07:00
Neil Fraser
02d60a2dbe Group variable rename into same event. 2016-03-06 14:51:03 -08:00
Neil Fraser
fee94ae405 Allow injection based on CSS selector (based on PR 249). 2016-02-29 15:11:00 -08:00
Neil Fraser
b567d6b0d7 Allow shadow blocks to be edited. 2016-02-26 00:22:31 -08:00
Neil Fraser
f0d04ba16b Fix RTL flyout events. 2016-02-24 16:52:55 -08:00
Neil Fraser
5297344a8b Fix RTL XML. 2016-02-16 13:04:47 -08:00
Neil Fraser
a4741f9feb Routine recompile. 2016-02-11 21:48:14 -08:00
Neil Fraser
f56dd7930b Routine recompile. 2016-02-05 18:44:53 -08:00
Neil Fraser
c374827204 Routine recompile. 2015-12-17 15:38:50 -08:00
Neil Fraser
15a18b7d9f Merge remote-tracking branch 'origin/2016' into 2016
# Conflicts:
#	msg/json/en.json
2015-12-17 15:36:46 -08:00
Neil Fraser
19c71573b7 Update messages.
Remove unused PROCEDURES_CALLNORETURN_CALL.  Add
PROCEDURES_DEFNORETURN_COMMENT and PROCEDURES_IFRETURN_HELPURL.
2015-12-17 15:34:23 -08:00
Madeeha
7d48f253e6 changing the controls_if_if block to allow controls_if_elseif and controls_if_else blocks to attach to the bottom of the if block instead of in the middle of the block. 2015-12-17 15:29:50 -08:00
Neil Fraser
fa279b91ce Add option to delete all blocks on workspace. 2015-12-02 22:10:09 -08:00
Neil Fraser
0b02c693fd Routine recompile. 2015-10-25 23:51:24 -07:00
Neil Fraser
c83faa3314 Fix colours on collapsed categories. 2015-10-14 15:00:32 -07:00
Neil Fraser
879cacbb8d Add 'clean up blocks' command to workspace menu. 2015-10-09 19:22:22 -07:00
Neil Fraser
fbab06082e Recompile language updates. 2015-09-28 14:17:53 -07:00
Neil Fraser
aaccb2ee1d Recompile language updates. 2015-09-11 21:47:17 -07:00
Neil Fraser
ce6ad13fbb Recompile after translations. 2015-07-23 13:09:06 -07:00
Neil Fraser
1ca2fdc844 Add classes to svg groups. 2015-07-14 23:13:09 -07:00
Neil Fraser
8a4edb7985 Post-translation recompile 2015-07-14 14:02:36 -07:00
Neil Fraser
bcebb0776b Allow flights to be initially expanded in toolbox. 2015-07-09 11:57:06 -07:00
Neil Fraser
798312a6b8 Fix open trashcan with undeletable block. 2015-07-01 14:04:59 -07:00
Neil Fraser
4858d9ecfe Routine recompile. 2015-06-22 15:45:18 -07:00
Neil Fraser
059c2f1778 Add automatic mode for internal/external input layout. 2015-06-10 18:45:15 -07:00
Neil Fraser
838a6a954b Remove interpolateMsg. 2015-06-08 18:38:33 -07:00
Neil Fraser
9050e32954 Adding JsonInit method of creating blocks. 2015-06-08 15:54:18 -07:00
Neil Fraser
9e8edc8c3f One pixel glitch in inline connections. 2015-05-26 19:07:21 -07:00