Commit graph

1890 commits

Author SHA1 Message Date
Rachel Fenichel
a979a422e4 Merge branch 'develop' of https://github.com/google/blockly into merge_sept_01 2016-09-01 16:52:08 -07:00
Emma Dauterman
953fb9f1b4 Blockly Factory: Check for Unsaved Changes in Workspace Factory (#617)
* Bug fix for adding variables and procedures categories with prompt, removed blocks from category name, check if unsaved changes in workspace factory before leave

* Updated flags in clear all. Added more comments

* Solved merge conflicts
2016-09-01 10:38:52 -07:00
Tina Quach
66188b4c54 Blockly Factory: Global Self Bug Fix (#616)
* fix bug with global self

* cleaned up code, moved warn into block lib controller, check for starter block in FactoryUtils.savedBlockChanges
2016-09-01 09:56:16 -07:00
Tina Quach
cbdf8a597e Blockly Factory: Warn user when leaving/refreshing page (#607)
* warn user upon refreshing page and leaving page (by going to prev page or by exiting the window or tab)

* alert upon leaving page ONLY when unsaved changes

* nit remove log

* no alert when on starter block, added clarifying comment
2016-08-31 13:39:47 -07:00
Emma Dauterman
8d89e62bc8 Fixed bug on updating flags for custom categories, adjusted starter code (#615) 2016-08-31 10:50:01 -07:00
Tina Quach
d6e71ffe38 scrollable block lib, fix bug for repeated alert about unsaved changes (#612) 2016-08-30 13:59:07 -07:00
Tim Mickel
f1aac859e3 Stripping old blocks code; moving blocks -> blocks_common, project-wide lint (#580)
* Remove unused Blockly blocks

* Remove unused text Blockly blocks; convert to JSON

* Move blocks/ -> blocks_common/

* Recompile for moved/removed blocks

* Remove spectools

* Project-wide lint

* Recompile August 30

* Pin package.json
2016-08-30 15:50:59 -04:00
Emma Dauterman
64d34b3cdc Close toolbox workspace toolbox when update block library (#610) 2016-08-30 10:59:17 -07:00
Tina Quach
a1ead192a6 Blockly Factory: Enhanced Block Library UI (#603)
* block library now dynamically updates buttons based on the current block open in block factory--whether or not it is saved, whether or not changes have been made, whether or not it's the starter block.

update buttons rather than switching to new block on delete

remove warning about updating block

alert when creating new block with unsaved changes

working warnings on tab switches and create new block

green buttons indicate user can save or update block, red save button indicates that user cannot save the block ( but encourages user to click button)

consistent button name on default

added alert upon switching between blocks without saving

 nit comments, condensing if statements, removing extra code

throw errors in sameBlockXml function of factory utils

created wrapper function for warning user about unsaved changes and checking if they'd like to proceed

cleaned up code for setSelected block

* nit change to warning message on block type being one of core block types

* nit helper text for exporter

* nit comments and spacing
2016-08-30 09:19:05 -07:00
Rodrigo Queiro
5c80a82a5f Fix flip_rtl regression (#579)
See #578
2016-08-30 11:09:43 -04:00
Rodrigo Queiro
73951aae66 Merge pull request #578 from drigz/bugfix/jsoninit-iconmenu
Make jsonInit able to create dropdowns again
2016-08-30 10:04:45 +02:00
Emma Dauterman
6e493be3c4 Blockly Factory: Confirm Changes with User, Reduce Alerts, Generate Starter Code (#606)
* Automatically generates flyout on switching to category

* Fixed import blocks bugs

* Made last set of UI changes and changes to starter code exporting

* Combined if statements

* Only add toolbox if not read only

* Removed extra curly braces
2016-08-29 15:31:03 -07:00
Tina Quach
7bbd125bd0 changed tab ordering and export selector buttons (#605) 2016-08-29 10:22:27 -07:00
Tim Mickel
58103770f9 Add build status buttons to README.md 2016-08-29 10:36:23 -04:00
Tim Mickel
1fd92fa075 Copy .travis.yml from scratch-vm 2016-08-29 10:32:49 -04:00
Rodrigo Queiro
468d899e04 Make jsonInit able to create dropdowns again
and add a test to detect future regressions.
2016-08-29 15:38:20 +02:00
Neil Fraser
14bd130e7c Routine recompile. 2016-08-26 16:14:40 -07:00
Neil Fraser
e495fb32bf Merge branch 'master' into develop 2016-08-26 15:46:59 -07:00
Emma Dauterman
9bb02abb2c Blockly Factory: Workspace Factory Options (#600)
* Some options stuff changed

* Finished changes to options, including moving readonly to toop, fixing zoom errors, indenting suboptions, generating an options string, getting category options automatically, and making max blocks clearer, and having number inputs

* Added null check and nit line length
2016-08-26 12:03:15 -07:00
Emma Dauterman
b7940fd156 Blockly Factory: Shadow Block UI (#602)
* Fixed bug of open flyout not updating by closing flyout, also changed shadow block editing UI to be a block that changes between add shadow and remove shadow

* Removed unncessary CSS rule
2016-08-26 11:44:15 -07:00
Emma Dauterman
4192ca6b52 Blockly Factory: Prompt User to Add Variables/Functions Category (#589)
* Fixed marking shadow blocks so keeps warnings when switching between categories

* Done with variable and procedure block checks

* Used setShadowDom instead of shadowDom_, and nit changes in wfactory init

* Fixed bug of disable div covering whole screen
2016-08-26 11:35:53 -07:00
Tina Quach
6e88d5c035 alert when creating new block with unsaved changes (#594)
working warnings on tab switches and create new block
2016-08-26 11:24:56 -07:00
Emma Dauterman
0cf5d12374 Blockly Factory: Resize Workspaces in Workspace Factory (#593)
* Made workspace factory toolboxes take up height of screen, made workspce options properly scrollable, fixed being able to accidentally see Block factory some times, made Exporter and workspace factory scrollable if necessary

* Nit alphabetize css rules

* Fixed display none problems for Block factory, making it so that it can be hidden properly

* Nit css style
2016-08-25 16:40:25 -07:00
rachel-fenichel
8e838256ce Merge pull request #599 from rachel-fenichel/bugfix/missing_require
Require constants in workspaceSvg, which uses them during initialization
2016-08-25 13:29:39 -07:00
Rachel Fenichel
e02e695bde Require constants in workspaceSvg, which uses them during initialization. 2016-08-25 13:28:05 -07:00
Tina Quach
31d6e941e7 Blockly Factory: Disable Disconnected Blocks, Nit UI, Bug fix (#595)
* disabled disconnected blocks in block factory

change to block def and also warn user

fixed bug and renamed math_foo

* clearUndo upon opening a saved block, change alert messages that use ok

* removed warning for unsaved blocks. in separate CL

* fix bug and make the blank option clickable
2016-08-25 11:29:29 -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
Niklas Laxström
49e0ef013d Localisation updates from https://translatewiki.net. 2016-08-25 07:24:44 +02: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
Tim Mickel
c6a5aa715b Convert hat drop-downs to fields (#576) 2016-08-23 17:50:41 -04: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