Commit Graph

1375 Commits

Author SHA1 Message Date
Evan W. Patton
dd0440d22e [WIP] Merge workspace.js 2016-09-30 12:34:41 -04:00
Evan W. Patton
356640ad3d [WIP] Removing variables.js rejections that are uninteresting 2016-09-28 22:37:03 -04:00
Evan W. Patton
8947f113ce [WIP] Merge trashcan.js 2016-09-28 22:14:01 -04:00
Evan W. Patton
5851a6deb9 [WIP] Merge scrollbar.js 2016-09-28 22:02:18 -04:00
Evan W. Patton
37f04bc014 [WIP] Merge mutator.js 2016-09-28 21:21:40 -04:00
Evan W. Patton
632e09ac12 [WIP] Merge input.js 2016-09-28 20:53:11 -04:00
Evan W. Patton
081574babe [WIP] Merge field.js and flyout.js 2016-09-28 20:51:17 -04:00
Evan W. Patton
a44c6c5688 [WIP] Merge css.js 2016-09-28 20:21:02 -04:00
Evan W. Patton
890d274735 [WIP] Merge connection.js 2016-09-28 20:17:44 -04:00
Evan W. Patton
eddade9eda [WIP] Merged block, blocks, blockly, and block_svg sans instrumentation issue 2016-09-28 18:18:45 -04:00
Evan W. Patton
16d1a6b362 [WIP] Rebase from Blockly SVN r1757 to git 641d720 2016-09-28 10:36:40 -04:00
Niklas Laxström
641d720842 Localisation updates from https://translatewiki.net. 2016-09-27 13:48:34 +02:00
Niklas Laxström
6632511b10 Localisation updates from https://translatewiki.net. 2016-09-22 07:18:22 +02:00
Katelyn Mann
398f8b9ff7 Merge branch 'develop' 2016-09-20 11:01:23 -07:00
Katelyn Mann
27199b8a3c routine recompile 2016-09-20 10:59:44 -07:00
Katelyn Mann
21841dcc14 Merge branch 'master' into develop 2016-09-20 10:51:00 -07:00
Sean Lip
270ed961bf Add aria-level and aria-selected attrs to dropdowns. 2016-09-19 19:33:35 -07:00
Sean Lip
f4e316e8a9 Prevent setting a number value to NaN. Select the field value on entry to an input field. State the contents of the input field when describing the field. 2016-09-19 16:59:24 -07:00
Sean Lip
284f71c46a Remove clipboard buttons to simplify UI. 2016-09-19 16:04:08 -07:00
Sean Lip
ee403c6a95 Add keyboard shortcuts for cut, copy and paste operations. 2016-09-19 15:45:46 -07:00
Sean Lip
791a9a2919 Move 'create new group' button to the bottom of each toolbox block, and remove other buttons if there is nothing in the workspace. 2016-09-16 22:33:49 -07:00
Neil Fraser
bc2bfbd53d Add shadow to flyout buttons. 2016-09-15 18:39:50 -07:00
Sean Lip
f701b36ee6 When cutting or copying a block, do not include blocks joined to it. 2016-09-15 18:26:36 -07:00
Sean Lip
72b00130e4 Remove tables from the HTML. Move the toolbar buttons to the end so that they don't impede switching between the toolbox and workspace. 2016-09-15 18:09:36 -07:00
Sean Lip
9da3e6c2dc Simplify the handling of the active desc for a toolbox without categories. 2016-09-15 17:43:56 -07:00
Niklas Laxström
d12374b3fb Localisation updates from https://translatewiki.net. 2016-09-15 08:08:54 +02:00
Niklas Laxström
93168bebc0 Localisation updates from https://translatewiki.net. 2016-09-13 07:35:35 +02:00
Sean Lip
6c05ece593 Minor wording change. 2016-09-08 18:22:02 -07:00
Niklas Laxström
a2a4d4194d Localisation updates from https://translatewiki.net. 2016-09-08 09:59:20 +02:00
Rachel Fenichel
6f8d28a961 Merge pull request #621 from rachel-fenichel/master
rebuild
2016-09-07 19:06:03 -07:00
Rachel Fenichel
e58671b99b rebuild 2016-09-07 18:50:36 -07:00
Rachel Fenichel
95937abc0c Merge pull request #620 from google/develop
Merge develop
2016-09-07 13:02:12 -07:00
picklesrus
dab7fd5751 Cherrypick fixes made directly to master back into develop (#619)
* Check result of window.confirm before deleting variables.

* Create CONTRIBUTING.md
2016-09-07 11:50:50 -07:00
Niklas Laxström
6fa9e92601 Localisation updates from https://translatewiki.net. 2016-09-05 07:05:06 +02: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
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
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
rachel-fenichel
9d68af8864 Create CONTRIBUTING.md 2016-08-29 11:03:08 -07:00
rachel-fenichel
8d5da82e00 Merge pull request #608 from lizlooney/confirm
Check result of window.confirm before deleting variables.
2016-08-29 10:28:30 -07:00
Tina Quach
7bbd125bd0 changed tab ordering and export selector buttons (#605) 2016-08-29 10:22:27 -07:00
Liz Looney
0ee5d6f933 Check result of window.confirm before deleting variables. 2016-08-27 22:03:06 -07:00
Neil Fraser
31055ac2eb Merge branch 'develop' 2016-08-26 16:15:02 -07: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