scratchfoundation/scratch-blocks
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-blocks.git synced 2025-08-28 22:10:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions
1789 commits 78 branches 380 tags 120 MiB
Commit graph

1789 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rachel Fenichel
4b5d4d4c26 Merge branch 'feature/variable_management' of https://github.com/google/blockly into feature/variable_management 2016-08-12 15:52:48 -07:00
Rachel Fenichel
c6ff049c92 Merge branch 'develop' into feature/variable_management 2016-08-12 14:39:32 -07:00
rachel-fenichel
aa8cc2cb9f Merge pull request #545 from rachel-fenichel/feature/variable_management 
Merge from develop.
 2016-08-12 14:37:09 -07:00
Rachel Fenichel
a2b3a3638a Merge branch 'develop' into feature/variable_management 2016-08-12 14:32:26 -07:00
rachel-fenichel
aa4014d933 Merge pull request #542 from rachel-fenichel/feature/procedure_variables 
Disallow deleting variables that are used in the definition of a function
 2016-08-12 14:23:29 -07:00
Tina Quach
3748b6f8bd refactored onTab to call a single function for visually turning tabs on or off depending on whether it is selected (#544) 2016-08-12 14:17:18 -07:00
Rachel Fenichel
70ff4291af Double quotes around variable names 2016-08-12 11:09:32 -07:00
rachel-fenichel
9a03734438 Merge pull request #543 from rachel-fenichel/bugfix/variable_from_toolbox 
Create variables on block creation
 2016-08-12 10:24:45 -07:00
Rachel Fenichel
d50f806624 Create variables on block creation 2016-08-11 17:31:19 -07:00
Rachel Fenichel
775e298c2c Disallow deleting variables that are used in the definition of a function 2016-08-11 17:10:15 -07:00
rachel-fenichel
5e787afe8e Merge pull request #539 from rachel-fenichel/feature/procedure_variables 
Create variables from the procedure definition mutator
 2016-08-11 16:39:07 -07:00
Rachel Fenichel
c7a5944ea3 Create variables from procedure definitions 2016-08-11 14:59:11 -07:00
rachel-fenichel
dd0e88b28b Merge pull request #537 from picklesrus/develop-dispose-injectiondiv 
Fix #536 by changing workspace's dispose method to remove the injectD…
 2016-08-11 11:26:11 -07:00
Katelyn Mann
bbd57a9a16 Fix #536 by changing workspace's dispose method to remove the injectDiv wrapper of the 
svg. The wrapper div was introduced in #512.
 2016-08-11 11:00:02 -07:00
Sean Lip
3a1d9cdec1 Prevent the tabbable area from being restricted to the toolbox and workspace. 2016-08-10 18:30:16 -07:00
rachel-fenichel
3019269f93 Merge pull request #526 from rachel-fenichel/feature/variable_management_deletion 
Ask user for confirmation when deleting multiple uses of a variable.
 2016-08-10 16:42:04 -07:00
Tina Quach
73fbc06d4a Blockly Factory: Foundation for Integrating Workspace Factory (#533) 
* working tabs using closure

expanded export settings menu

added old blockfactory and moved new files into blocklyfactory

expanded export to lay groundwork for workspace factory integration

fixed BlockFactory escapeString bug

* added TODO for refactoring onTab
 2016-08-10 14:56:21 -07:00
rachel-fenichel
99362955ab Merge pull request #531 from rachel-fenichel/bugfix/toolbox_separator 
Parse separators in xml in always-open flyouts
 2016-08-10 12:28:26 -07:00
Emma Dauterman
8211bb30f4 Workspace Factory (#522) 
Workspace factory helps developers configure their workspace by allowing them to drag blocks into the workspace to add them to their toolbox. 
Current features:

supports categories or a single flyout of blocks
updates a preview workspace automatically
imports toolbox XML already written
exports toolbox XML to a file
prints toolbox XML to the console
imports a standard Blockly category
supports shadow blocks (allowing the user to move shadow blocks and toggle between shadow blocks and normal blocks), disabled blocks, block groups
allows the user to add/move/delete/rename/color categories and separators.
 2016-08-10 11:03:11 -07:00
Tina Quach
9819d677a9 Blockly Factory: Block Library & Block Exporter (#530) 
Created Blockly Factory, an expansion of the Block Factory demo that adds the Block Library and Block Exporter to the Block Factory. 

The Block Library provides the interfaces for the user to save their blocks to local storage so that upon opening and closing the page, their blocks will still persist. In Blockly Factory, Users can re-open saved blocks for edit through a dropdown interface, delete blocks from their library, clear their block library, and import and export their block library. Importing and exporting their block library may be useful for creating specific sets of in-progress blocks for editing.

The Block Exporter allows users to export block definitions and generator stubs of their saved blocks easily by using a visual interface powered by Blockly. It contains a selector workspace in which users add and remove blocks to the workspace to select and deselect them for export.
The exporter also contains an export settings form through which people may export block definitions and generator stubs.
 2016-08-10 10:49:19 -07:00
Rodrigo Queiro
729bd588f4 Use correct field name - fixes #559 (#561) 2016-08-10 11:35:40 -04:00
Rachel Fenichel
dc02dfb8ff Separators specified in toolbox XML should replace, not add to, previous gaps. 2016-08-09 17:51:50 -07:00
Sean Lip
93af9c59b3 Add functionality for playing audio files. 2016-08-09 17:29:53 -07:00
Rachel Fenichel
65d785a86d New message for deletion; block dispose is a noop if it's already been deleted 2016-08-09 17:17:08 -07:00
Rachel Fenichel
3998ecec3a Parse separators in xml in always-open flyouts 2016-08-09 16:34:59 -07:00
Rodrigo Queiro
8e1b22757b Adjust vertical alignment of horizontal field text (#558) 
Fixes #555.
 2016-08-09 14:41:57 -04:00
Rachel Fenichel
cdbfce87de Make disposeUses private 2016-08-09 11:30:32 -07:00
rachel-fenichel
0b87100b2a Merge pull request #554 from drigz/cleanup/double-require 
Remove duplicated FieldNumber require
 2016-08-09 11:15:16 -07:00
rachel-fenichel
5aa3add06c Merge pull request #528 from drigz/test/domToWorkspace 
Add a test for domToWorkspace
 2016-08-09 11:11:53 -07:00
rachel-fenichel
e0068cab41 Merge pull request #557 from drigz/bugfix/headless-render 
Don't call SVG methods on headless workspaces
 2016-08-09 11:10:52 -07:00
Rachel Fenichel
bf6220cb42 Ask user for confirmation when deleting multiple uses of a variable. 2016-08-09 10:45:26 -07:00
Rodrigo Queiro
ef55c29d52 Add a test for domToWorkspace 
This would have caught a recent
[Scratch Blocks regression](https://github.com/LLK/scratch-blocks/pull/557)
where domToWorkspace failed unless given a WorkspaceSvg instance.
 2016-08-09 15:50:34 +02:00
Rodrigo Queiro
0012fccb4a Don't call SVG methods on headless workspaces 
This fixes XML import for headless workspaces. The bug was introduced by
8e652db (a merge of google/blockly/develop), which moved the code outside
the `if (workspace.rendered)` guard. See:

* [parent 1](c92504fd98/core/xml.js (L357))
* [parent 2](efc2ca3/core/xml.js (L356))
* [merge](8e652db9fe/core/xml.js (L359))
 2016-08-09 14:57:22 +02:00
Rodrigo Queiro
99028b13a1 Remove duplicated FieldNumber require 2016-08-09 12:31:26 +02:00
rachel-fenichel
c9af6eaf36 Merge pull request #525 from rachel-fenichel/feature/variable_management_merge_develop 
Merge from develop and recompile.
 2016-08-08 17:00:38 -07:00
Rachel Fenichel
9adb9c0cdb Recompile 2016-08-08 16:59:25 -07:00
Rachel Fenichel
350e1ff2cc Merge remote-tracking branch 'upstream/develop' into feature/variable_management_merge_develop 2016-08-08 16:58:51 -07:00
Sean Lip
7edbaf9ee2 Announce top-of-list, bottom-of-list, and current location in response to up/down/tab/shift-tab keypresses, where appropriate. 2016-08-05 17:52:02 -07:00
Sean Lip
afe3c63cab Do not intercept keystrokes that include Alt/Ctrl. 2016-08-05 17:26:23 -07:00
Sean Lip
78ae42b267 After marking a spot or copying a block in the workspace, move the active desc to the parent. 2016-08-05 17:20:41 -07:00
Sean Lip
f7b0c1b5e6 Move action menu below the block description. Edit the aria label to improve discoverability of the submenu. 2016-08-04 19:28:36 -07:00
Sean Lip
051d5bc099 Remove superfluous menus from toolbox. Use aria live region instead of alerts, and redo the text based on user feedback. Add a simple tutorial at the top of the demo page. 2016-08-04 19:04:13 -07:00
Sean Lip
e4b01dee44 Remove block input list breakdowns from the toolbox. 2016-08-04 16:45:25 -07:00
Neil Fraser
875ffad42c Fix selection bug on bumps caused by mutator actions. 2016-08-03 18:33:18 -07:00
Neil Fraser
d6d8b8eb97 Remove obsolete webkit CSS prefixes. 2016-08-03 18:33:18 -07:00
Neil Fraser
2be214ca74 Remove apparently unneeded scrub on procedures. 2016-08-03 18:33:18 -07:00
Sean Lip
d362c73a04 Allow a placeholder for empty fields to be specified when generating block descriptions. (#509) 
* Allow a placeholder for empty fields to be specified when generating block descriptions.

* Correctly handle recursive block stringification.
 2016-08-03 17:47:34 -07:00
Sean Lip
69c887c998 Use a shorter name for the toolbox category aria labels. 2016-08-03 14:57:45 -07:00
Sean Lip
9f22701a42 Remove disabled blocks from the accessible blockly demo. 2016-08-03 14:56:13 -07:00
Sean Lip
5268ca94b9 Use more descriptive ARIA labels for toolbox categories. 2016-08-02 18:06:55 -07:00