Commit Graph

1563 Commits

Author SHA1 Message Date
Sean Lip
cf9a4fbdf4 Allow attaching blocks to a marked spot from the toolbox modal. This is the last prerequisite for removal of the existing on-screen toolbox. 2016-11-17 17:12:27 -08:00
Sean Lip
df56c64f4f Fix some bugs arising in the toolbox modal for the no-categories case. 2016-11-17 16:13:43 -08:00
Sean Lip
6ab1244560 Add a contextual modal for the toolbox. 2016-11-17 15:58:23 -08:00
Neil Fraser
0e9651ee88 Fix conflict between 'utils' and 'image dropdown' merges. 2016-11-16 17:56:25 -08:00
Sean Lip
a027ec8573 Move away from using a common modal service, since the block options and the toolbox modals are going to end up behaving fairly differently. 2016-11-16 16:47:26 -08:00
Andrew n marshall
dd95203cdc controls_ifelse: Remove right-align. Remove Boolean check on statements. (#749) 2016-11-16 09:55:58 -08:00
Neil Fraser
8fba5cd044 Fix selection border on blocks that have been highlighted. 2016-11-15 17:49:51 -08:00
Sean Lip
471e09662e Hide notification messages after a short time interval. 2016-11-15 17:37:38 -08:00
Sean Lip
25588fc7bd Break the sidebar out into its own individual component. 2016-11-15 17:19:01 -08:00
Neil Fraser
c27841f8df Fix compiler errors. 2016-11-15 16:41:11 -08:00
Andrew n marshall
e5d25bb686 String reference in JSON string messages (#741)
* Adds message references to message string interpolation, in the form of %{BKY_STRING}.
 * Re-adding CONTROLS_IFELSE block using the new syntax, referencing to CONTROL_IF equivalents.
2016-11-15 15:51:51 -08:00
Neil Fraser
f6aef459fc API-breaking cleanup. But doubtful anyone will be affected. (#748)
* Make add/removeClass return whether they did anything.
* Move more functions onto utils.
* Move bind functions to Blockly.
* Routine recompile.
2016-11-15 13:54:33 -08:00
picklesrus
7f02c19bfe Improve performance of block dragging. This is a backport of the blo… (#732)
Improve performance of block dragging.  This is a backport of the block drag surface from scratch-blocks.  At the beginning of a block drag, blocks get moved to a drag surface which then translates using translate3d to avoid repainting the entire svg on every mouse move.  At the end of the drag, the blocks are dropped back in the svg in their new position.
2016-11-15 13:19:49 -08:00
Rachel Fenichel
1f67654088 Merge pull request #736 from google/fraser-develop
Allow images in dropdown menus.
2016-11-15 13:07:46 -08:00
Sean Lip
bed33a9b61 Disallow clicks on disabled buttons. 2016-11-14 18:48:29 -08:00
Sean Lip
293a86505b Merge branch 'develop' of https://github.com/google/blockly into develop 2016-11-14 18:32:15 -08:00
Sean Lip
b1109f47f0 Add correct focus behavior for the modal. Update boundary sounds. 2016-11-14 18:31:36 -08:00
Neil Fraser
594c46785f Remove obsolete Gecko image hack. Apparently this has been fixed in Gecko. 2016-11-14 17:36:02 -08:00
Sean Lip
14f0a1cd3d Merge branch 'develop' of https://github.com/google/blockly into develop 2016-11-11 18:30:34 -08:00
Rachel Fenichel
1a7adaf30e Merge pull request #746 from rachel-fenichel/remove_controls_ifelse
Remove ifelse block and messages
2016-11-11 17:25:43 -08:00
Rachel Fenichel
82261e3d68 Remove ifelse block and messages' 2016-11-11 17:21:29 -08:00
Rachel Fenichel
845e00c72c Merge pull request #745 from rachel-fenichel/merge_master_to_develop_nov_11_16
Merge master to develop nov 11 16
2016-11-11 17:11:29 -08:00
Rachel Fenichel
3cfdb9cb6c rebuild 2016-11-11 17:06:17 -08:00
Rachel Fenichel
b5822e2925 Revert "Revert "Rebuild nov 3 16""
This reverts commit c8ca24a000.
2016-11-11 17:05:13 -08:00
Rachel Fenichel
d04d8280c7 Merge branch 'master' into merge_master_to_develop_nov_11_16 2016-11-11 16:17:53 -08:00
Rachel Fenichel
840ddf146f Merge pull request #744 from AnmAtAnm/temp
Unblock push to master.
2016-11-11 15:50:09 -08:00
Andrew n marshall
eafd29fa78 Unblock push to master. 2016-11-11 15:25:39 -08:00
Neil Fraser
32713726dc Don't split dropdown text if there is an image. 2016-11-11 04:27:54 -08:00
Niklas Laxström
a65baf9ead Localisation updates from https://translatewiki.net. 2016-11-10 08:40:52 +01:00
Sean Lip
bae7426ec6 Remove copy/paste buttons. 2016-11-09 14:46:33 -08:00
Rachel Fenichel
1e631965c1 Merge pull request #729 from rachel-fenichel/feature/import_definitions
Add ability to define blocks with a json array
2016-11-09 13:43:30 -08:00
Rachel Fenichel
26c10fe585 lint 2016-11-09 13:42:58 -08:00
Sean Lip
32352b49e0 Merge pull request #716 from nilq/master
Rename README to README.md
2016-11-09 13:20:14 -08:00
Rachel Fenichel
6783efd6d8 Merge pull request #739 from rachel-fenichel/bugfix/move_css
Move injected css to start of head
2016-11-09 13:14:21 -08:00
Rachel Fenichel
34a6d5e6e4 simplification 2016-11-09 13:12:18 -08:00
Rachel Fenichel
d91ba9e2f9 Move injected css to start of head 2016-11-08 16:54:35 -08:00
Rachel Fenichel
4f47397b44 Merge pull request #738 from google/revert-731-rebuild_nov_3_16
Revert "Rebuild nov 3 16"
2016-11-08 16:47:29 -08:00
Neil Fraser
c8ca24a000 Revert "Rebuild nov 3 16" 2016-11-08 16:46:00 -08:00
Rachel Fenichel
c19dc43d17 Merge pull request #731 from rachel-fenichel/rebuild_nov_3_16
Rebuild nov 3 16
2016-11-08 16:45:45 -08:00
Rachel Fenichel
da5c7bcd2a Fix workspace factory bug and rebuild 2016-11-08 16:44:16 -08:00
Rachel Fenichel
80e9a5663c Fix bug with longpress and touch on ios 2016-11-08 16:18:05 -08:00
Rachel Fenichel
406fe8c26a Message fixes and lint 2016-11-08 16:16:02 -08:00
Rachel Fenichel
668b373434 Merge pull request #737 from AnmAtAnm/if_else
Translation comment for CONTROLS_IFELSE_TITLE
2016-11-07 15:47:59 -08:00
Andrew n marshall
9dbe4c2f53 Clarify the translation comment for CONTROLS_IFELSE_TITLE, including parameter usage descriptions and more specific example link. 2016-11-07 15:29:27 -08:00
Neil Fraser
01ab0b4ab6 Add arrow to images in dropdown menus. Fold updateTextNode_ into render_. 2016-11-06 21:19:07 -08:00
Neil Fraser
98c341bcfb Allow images in dropdown menus. 2016-11-05 00:17:07 -07:00
Neil Fraser
5b033e2f7b Misc cleanup. 2016-11-05 00:15:39 -07:00
Siebrand Mazeland
d6f0846b57 Localisation updates from https://translatewiki.net. 2016-11-04 21:22:03 +01:00
Siebrand Mazeland
9e645402d1 Localisation updates from https://translatewiki.net. 2016-11-04 12:20:18 +01:00
Rachel Fenichel
08efd1381c Merge pull request #640 from rachel-fenichel/feature/disallow_shadow_variables
disallow variables on shadow blocks
2016-11-03 16:59:07 -07:00