Commit graph

419 commits

Author SHA1 Message Date
Tim Mickel
8cba76df19 Fix multi-playground and add block with text field to playgrounds ()
* Fix multi-playground for new blocks

* Add "broadcast text" block for string field example
2016-04-13 16:24:47 -04:00
Tim Mickel
4e5717d5a1 Basic bug fixes for vertical rendering
* Add FIELD_WIDTH, FIELD_HEIGHT; remove UI effects

* Update vertical_playground to be basically functional
2016-04-11 16:49:07 -04:00
Neil Fraser
2d696aa731 Normalize order of languages. 2016-04-08 22:56:42 -07:00
Andrew Sliwinski
c1942bdc7b Initial mockup of LEGO WeDo blocks ()
Initial mockup of wedo blocks
2016-04-08 08:50:09 -04:00
Neil Fraser
99f332f749 Fix getBlockById unit test. Issue 2016-04-07 14:35:01 -07:00
rachel-fenichel
18a1550285 Horizontal toolbox layout with positioning at start or end. 2016-04-07 14:02:22 -07:00
rachel-fenichel
002e470ccd ghost -> insertion marker 2016-04-06 14:42:12 -07:00
Neil Fraser
4e42a1b78e Swap order of arguments on domToWorkspace. 2016-04-04 18:31:41 -07:00
Rodrigo Queiro
46ed2fa129 Merge pull request from drigz/bugfix/field-active-area
Increase active area on one-field-blocks 
2016-04-04 11:09:55 +02:00
Rodrigo Queiro
a6a39fb49b Use text cursor on whole of horizontal input field
We do this by applying the style to the same element we apply the click
target to, ie the whole block if it only has one field.
2016-04-04 11:07:20 +02:00
Tim Mickel
a65109f423 Merge remote-tracking branch 'Google/master' into google-master-april-1
# Conflicts:
#	blockly_compressed_horizontal.js
#	blockly_uncompressed_vertical.js
#	blocks_compressed.js
#	core/block.js
#	core/block_svg.js
#	core/blockly.js
#	core/connection.js
#	core/field_textinput.js
#	core/workspace_svg.js
#	generators/lua/lists.js
#	generators/lua/text.js
#	msg/js/he.js
#	msg/js/id.js
#	msg/js/sr.js
#	msg/js/zh-hant.js
#	msg/json/en.json
2016-04-01 14:44:46 -04:00
Rodrigo Queiro
4daf3cd16f Increase active area on one-field-blocks
If a block only has one field, the mouseup event (which triggers editing
of editable fields) will be bound to the block instead of the field.

Fixes .
2016-03-31 16:43:17 +02:00
Tim Mickel
71d11c6713 Update tests to enable zoom/wheel 2016-03-29 13:12:20 -04:00
rachel-fenichel
8c44d5f4fb Make tests work.
We really need to have mocks for testing at this point.
2016-03-28 11:27:44 -07:00
rachel-fenichel
d442a997d6 Don't consider ghosts when looking for the closest connection.
New branch due to merge problems with .
2016-03-18 14:12:11 -07:00
Neil Fraser
a3b850b0d3 Merge pull request from rachel-fenichel/feature/source_block_fn
Add a getter; stop accessing private field sourceBlock_ from outside …
2016-03-16 19:45:20 -07:00
rachel-fenichel
2c70f7ec26 Add a getter; stop accessing private field sourceBlock_ from outside of a connection. 2016-03-15 16:03:49 -07:00
Tim Mickel
5241c4dd9f Merge remote-tracking branch 'Google/develop' into upstream-march-15
# Conflicts:
#	blockly_compressed_vertical.js
#	blockly_uncompressed_vertical.js
#	blocks/text.js
#	core/block_svg.js
2016-03-15 10:35:47 -04:00
rachel-fenichel
4ae34599e0 Don't connect a block with no next connection if that would force a bump. 2016-03-11 17:38:59 -08:00
Neil Fraser
ff7629f601 Merge pull request from rachel-fenichel/bugfix/connection_logic
Fix connection.closest and tests.
2016-03-11 14:08:10 -08:00
rachel-fenichel
50975170d7 Fix search for closest 2016-03-11 13:13:34 -08:00
rachel-fenichel
23df4765c0 fix test 2016-03-11 11:41:02 -08:00
Tim Mickel
516cd05d82 Merge remote-tracking branch 'Google/develop' into feature/upstream-merge-march-11-2
# Conflicts:
#	blockly_compressed_vertical.js
#	blocks_compressed.js
#	build.py
#	core/connection.js
#	core/workspace.js
#	tests/playground.html
2016-03-11 13:18:14 -05:00
Rodrigo Queiro
a5d3f340e5 Add a Lua code generator
This is based on the JS generator, with a lot of inspiration from Ellen
Spertus's blockly-lua: https://github.com/espertus/blockly-lua

All unit tests pass with Lua 5.3.2.
2016-03-10 10:24:25 +01:00
Neil Fraser
55a94a14f0 Add naked variable to generator test. 2016-03-09 11:51:57 -08:00
rachel-fenichel
abd1b5c5b8 Merge pull request from rachel-fenichel/feature/connection_db_testing
Connection db testing
2016-03-03 11:40:26 -08:00
Neil Fraser
016d2e74d7 IE does not have sessionStorage on file:// URLs. 2016-03-02 16:38:58 -08:00
Neil Fraser
5097963cb1 Reduce code duplication in 'if' block. 2016-03-01 18:21:02 -08:00
Tim Mickel
f8bf31bb10 Add runJavaScriptTextInputPanelWithPrompt
Handles window.prompt inside WKWebView
2016-03-01 13:18:10 -05:00
Rachel Fenichel
42065aec3d Cleaned up comments 2016-02-29 15:08:58 -08:00
Rachel Fenichel
7671986734 Move isConnectionAllowed to connection; clean up 2016-02-29 15:04:07 -08:00
Neil Fraser
6eb652cf70 Fix persistence of logging in playground. 2016-02-29 15:02:05 -08:00
Rachel Fenichel
f802899932 Merge branch 'develop' into feature/connection_tests 2016-02-29 12:35:52 -08:00
rachel-fenichel
120e73c218 Merge pull request from rachel-fenichel/feature/test_pages
Fix jsunit test page
2016-02-29 10:28:38 -08:00
Rachel Fenichel
c177fa5276 add searchForClosest 2016-02-26 16:35:22 -08:00
Rachel Fenichel
1b1d777bc5 Add isConnectionAllowed and tests for it 2016-02-26 16:17:17 -08:00
Rachel Fenichel
0a363803f0 Clean up removeConnection; port in more tests. 2016-02-26 14:41:49 -08:00
Rachel Fenichel
e3b05ad2c1 Move connection_db to a new file and start adding tests 2016-02-26 14:13:18 -08:00
Tim Mickel
ef42dd7ca4 Strip out unncessary pieces of spec tool 2016-02-26 14:48:34 -05:00
Rachel Fenichel
ec8145975f Fix jsunit test page 2016-02-26 11:33:39 -08:00
Tim Mickel
be6ebbeebf Add spec tool playground
This playground has:
-Wire grid on by default and sized to the correct px to match Carl's grid
-Partially transparent workspace overlaid on a background image (i.e. for Carl's specs)
-Default zoom for precision working on paths
2016-02-26 14:23:01 -05:00
Rachel Fenichel
240b8d68ae connection tests and js style fixes 2016-02-26 11:05:36 -08:00
Rachel Fenichel
9263e28263 Add tests for connection logic 2016-02-25 15:16:32 -08:00
rachel-fenichel
48a449b63a Merge pull request from rachel-fenichel/feature/multi-playground
Additional playground with multiple instances of blockly
2016-02-23 15:46:19 -08:00
Rachel Fenichel
b4256247fb fix annotations and rename 2016-02-23 14:55:15 -08:00
Ray Schamp
b9ea043dfe Add sample say block to horizontal playground 2016-02-23 16:59:54 -05:00
Rachel Fenichel
4230dd2b83 Fix checking deletion rectangles and fix toolbox config. 2016-02-19 16:23:32 -08:00
Rachel Fenichel
e0c2f191ff multi-playground 2016-02-19 13:10:51 -08:00
Ray Schamp
1a6dff7f42 Merge branch 'master' of github.com:google/blockly into merge/google-2016
# Conflicts:
#	blockly_compressed_vertical.js
#	blockly_uncompressed_vertical.js
#	blocks/text.js
#	blocks_compressed.js
#	core/block_svg.js
#	core/connection.js
#	core/field_textinput.js
#	core/flyout.js
#	core/toolbox.js
#	tests/playground.html
2016-02-18 13:29:25 -05:00
Ray Schamp
e2e82dd91e Merge pull request from tmickel/feature/iOS-playground-wrapper
iOS playground wrapper 
2016-02-18 10:09:46 -05:00