Commit graph

1313 commits

Author SHA1 Message Date
Rachel Fenichel
dc6ca79d4b Merge branch 'develop' into feature/simple_multitouch 2016-08-25 12:25:48 -07:00
rachel-fenichel
b8651e1597 Merge pull request #575 from rachel-fenichel/bugfix/is_finite
Fix #571
2016-08-25 09:55:07 -07:00
rachel-fenichel
69d75e5214 Merge pull request #590 from rachel-fenichel/bugfix/content_height
Fix #586
2016-08-24 14:04:49 -07:00
rachel-fenichel
8a90735a79 Merge pull request #588 from drigz/flyout-spacing
Add GAP_X/Y to the flyout
2016-08-24 13:10:08 -07:00
Rachel Fenichel
f75fc6359b Fix #586 2016-08-24 11:37:02 -07:00
Emma Dauterman
359e48c41b Blockly Factory: Warning for Undefined Blocks (#581)
* Done adding warning if not using defined block

* Nit comments

* Nit warning message

* Small fix for clear

* Fixed merging errors
2016-08-24 11:19:19 -07:00
Tina Quach
134b40c275 Blockly Factory: Use StandardCategories, No Abbreviations (#583)
* used standard categories

no abbrevs in function names for controllers

* no abbreviations in factory_utils function names
2016-08-24 10:31:29 -07:00
Tina Quach
8e44684c81 Blockly Factory: Clean Up Workspace on Save Block, Import Lowercase Types (#584)
* save only factory base block upon save to library; import block library with lowercase blocktypes

* nit comment
2016-08-24 10:29:24 -07:00
Rodrigo Queiro
5d7b2074a4 Add GAP_X/Y to the flyout
This makes it easy for users to customise the spacing in the flyout,
without having to repeat the same value of "sep" for every block.
2016-08-24 15:01:32 +02:00
Neil Fraser
2995f76ed8 Routine recompile. 2016-08-24 03:08:13 -07:00
Neil Fraser
591f6bfe4c Revert "Remove apparently unneeded scrub on procedures."
This reverts commit 2be214ca74.
2016-08-24 03:05:30 -07:00
Neil Fraser
b614cfb1c1 Fix RTL comparator operators. 2016-08-24 02:49:53 -07:00
Sean Lip
3cf06078a2 Minor wording edits. Fix issue with Voiceover not detecting changes to block labels. 2016-08-23 16:01:25 -07:00
Emma Dauterman
aa9dd9646a Bug fix for clear (#582) 2016-08-23 13:47:08 -07:00
Tina Quach
b0432306a1 Blockly Factory: New Selector UI (#579)
* generate block selector with checkboxes

working click handler

updated block exporter view and controller to work with new UI

select a block by clicking on the option--not just checkbox

renamed selectorWorkspace and fixed checkbox selecting bug

adding used blocks works

added and cleaned up css, removed extra exporter controller function, nit  comment

simplified code

* style

* does not clear selected blocks upon tab switch

* added tooltips to buttons, reworded some buttons

* remove console.log statement and clarify this.selected in blockoption

* removed console log & nit comment
2016-08-23 13:39:01 -07:00
rachel-fenichel
8127c69ff2 Merge pull request #580 from rachel-fenichel/bugfix/horizontal_rtl
Make blocks appear in the rtl horizontal flyout
2016-08-23 13:15:24 -07:00
Emma Dauterman
ab850b9863 Blockly Factory: Workspace Factory UI (#577)
* Some UI changes made

* CSS changes

* Done with UI tweaks

* Changing arrow key event listeners, also changing category header in category list

* Fixed bug with error on updating toolbox with read only

* Changes to factory.css and workspacefactory view

* Bug fixes and UI changes and refactoring to have enableKeyEvents in wfactory controller

* Uncommented catch

* Changes to app_controller.js to use constants, other nit changes

* Nit line breaks
2016-08-23 10:48:36 -07:00
Tina Quach
6953afb0b5 added preview of code to export in exporter tab, it dynamically updates with each block selection (#573)
moved inject code out to factory utils, refactored updatePreview and similar functions in exporter controller

refactor
2016-08-23 10:33:48 -07:00
Tina Quach
7516866804 Blockly Factory: Select Used Blocks for Export (#565)
* addAllUsedBlocks in exporter works when you hand set the instance variable.

added click handler for export button (which got lost in refactor).

saveStateFromWorkspace on tab switch

fixed bug in deselect block in exporter; added warning alert for add all used blocks

* nit line

* not warning for standard block types
2016-08-22 18:07:52 -07:00
Emma Dauterman
66eff965c9 Blockly Factory: Workspace Factory Import Buttons (#578)
* Split import into 2 buttons, made file endings consistent

* Nit spelling

* Nit removed logging message
2016-08-22 17:48:31 -07:00
Tina Quach
37fae54a59 Block Factory: Nit UI Changes (#570)
* switch block factory buttons, clarify exporter helper text,rename block selector

* add space between navigation bar and content. hide toolbox content.

* nit space

* moved helper text out of the columns and moved currently selected blocks into export settings
2016-08-22 17:45:28 -07:00
Rachel Fenichel
3e4efe9424 Make blocks appear in the rtl horizontal flyout 2016-08-22 17:09:14 -07:00
rachel-fenichel
8c4ecc421b Merge pull request #574 from rachel-fenichel/cleanup/mainWorkspaceMetrics
Prefer functions in workspaceSvg to functions in blockly.js
2016-08-22 15:11:00 -07:00
Rachel Fenichel
546504a88a Merge remote-tracking branch 'upstream/develop' into cleanup/mainWorkspaceMetrics 2016-08-22 15:09:47 -07:00
Neil Fraser
c41a4fa6e4 Fix ability to expand toolbox categories. 2016-08-21 14:29:07 -07:00
Rachel Fenichel
a74acd942e Use isFinite instead of Number.isFinite 2016-08-19 15:04:07 -07:00
Emma Dauterman
7fc476db36 Made StandardCategories a namespace for all of BlocklyFactory to use, included coreBlockTypes (#572) 2016-08-19 14:59:09 -07:00
Rachel Fenichel
cc9396d739 Prefer functions in workspaceSvg to functions in blockly.js 2016-08-19 14:13:20 -07:00
Emma Dauterman
61af94314e Blockly Factory: Generate Block Library Category in Workspace Factory (#568)
* Added block library category to toolbox workspace in workspace factory and update it each time user switches to workspace factory

* Added whitespace to end of index.html

* Bug fixes for convertShadowBlocks and updateState

* Last part of bug fix for adding separators
2016-08-19 09:48:51 -07:00
Rodrigo Queiro
88eac2480b Convert string tag name to goog.dom.TagName (#515)
in createDom calls only. This improves the type information of the
created objects.
2016-08-19 03:55:45 -07:00
Sean Lip
e03b191f73 Add more help labels. 2016-08-18 19:27:25 -07:00
rachel-fenichel
21fea1279c Merge pull request #557 from google/feature/variable_management
Integrate variable management into develop.
2016-08-18 15:56:18 -07:00
Tina Quach
bbb80c5243 Blockly Factory: Warn ONLY if Using Standard Block Name (#567)
* remove warning after user changes block type

* nit comment

* nit line length
2016-08-18 15:42:21 -07:00
Emma Dauterman
394b618a67 Blockly Factory: Import Blocks to Workspace Factory (#566)
* Can import blocks in JSON and Javascript to generate new category in toolbox workspace

* Added try/catch to file reading

* Added comment to getDefinedBlocks in generator and changed name

* Use random color for imported category and use different call to
update toolbox

* Nit removed extra line
2016-08-18 15:41:26 -07:00
Emma Dauterman
00c04688da Blockly Factory: Shadow Block Validation in Workspace Factory (#563)
* Added more shadow block validation and cascading when adding shadow blocks

* Rebased and small bug fix in add category

* Removed warning text in addShadow

* Broke long if statement into inlined function
2016-08-18 15:37:19 -07:00
Rachel Fenichel
7a7932acc7 No longer drops mouseUps; fixed lint per neil's comments 2016-08-18 14:46:28 -07:00
Tina Quach
204e28f63f block library now exports valid xml and properly handles the imported xml in a robust way (#555) 2016-08-18 09:20:09 -07:00
Sean Lip
6da1f56879 Change below/above to after/before for 'paste' and 'mark spot' buttons. 2016-08-17 16:31:41 -07:00
Sean Lip
b6d3351739 Add more indicators to move to the right to view the submenu. 2016-08-17 16:21:50 -07:00
Rachel Fenichel
15d937c63a Merge remote-tracking branch 'upstream/feature/variable_management' into feature/variable_management 2016-08-17 16:10:26 -07:00
Rachel Fenichel
0f7907c680 Update variable-related messages 2016-08-17 16:08:38 -07:00
Rachel Fenichel
d2ce081dc4 Move functions for updating variables on a workspace into workspace.js, and some lint 2016-08-17 16:07:50 -07:00
Emma Dauterman
7b854f85a4 Blockly Factory: Update Workspace Factory Tab (#562)
* Updated tab in blockly factory to reflect changes made to workspace factory, changes mainly in index.html and wfactory_init.js

* Added tab for workspace editing mode

* Changed font size in dropdown menu

* Added class for options inputs to add event listeners more easily
2016-08-17 15:56:30 -07:00
Tina Quach
55aa5b804a Blockly Factory: Generate Category Xml (#552)
* generate category xml from block library and from imported block defs

* simplified algorithms for parsing block definition and cleaned up style

* refactored getCategoryFromBlockDefs, breaking it up and moving it to FactoryUtils

* refactored getCategoryXml, fixed bug in updatingToolBox of exporter

* removed unneeded function, added quick check for empty library

* nit comments
2016-08-17 15:49:24 -07:00
rachel-fenichel
eba075b5b6 Merge pull request #556 from rachel-fenichel/feature/variable_management
Use a Blockly.Msg for button text
2016-08-16 16:56:32 -07:00
Rachel Fenichel
19722e2350 Use a Blockly.Msg for button text 2016-08-16 16:53:53 -07:00
Emma Dauterman
e633539d52 Blockly Factory: Rename WorkspaceFactory Classes (#553)
* Changed all namespaces from 'Factory' to 'WorkspaceFactory'

* Fixed brace problem in factory.js, syntax error in app_controller.js
2016-08-16 16:14:51 -07:00
Emma Dauterman
33f0f51968 Wrote getAllUsedBlockTypes in model, small change to generator (squashed commit) (#554) 2016-08-16 16:00:27 -07:00
Emma Dauterman
8ec5745611 Add Workspace Factory to Blockly Factory Tab (#538)
* Starting to integrate workspacefactory

* Committing before switching branches

* Tab for workspace factory working

* Committing before switching branches

* Refactored to have FactoryInit namespace and move logic out of AppController

* Nit typo fix.

* Fixed bugs from rebasing

* Nit fix in factory.css

* Added this. to previewWorkspace
2016-08-16 15:52:12 -07:00
Tina Quach
1c06bcdacc Blockly Factory: Warn if Using Standard Block Name (#550)
* added warning if a block type already exists in blockly standard category

simplified isStandardBlockType

* simplified code, removed isStandardBlockType function

* nit remove implementation detail from comment
2016-08-16 15:48:27 -07:00