Commit graph

196 commits

Author SHA1 Message Date
Neil Fraser
741491347b Add list of ids to create/delete events for robustness. 2016-03-28 18:10:54 -07:00
Neil Fraser
b8d48ebabe Destroy attached shadow block when input is destroyed. 2016-03-26 19:37:12 -07:00
rachel-fenichel
acae0e57ae C blocks consume other blocks. 2016-03-22 13:03:56 -04:00
Neil Fraser
d086634394 Lint and recompile. 2016-03-18 15:19:26 -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
1d2f712456 WIP on ghosts for pants blocks 2016-03-16 11:12:30 -07:00
Rachel Fenichel
2d2aca5d48 complicated ghosts 2016-03-16 11:12:30 -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
74ea1f1ffe consider the last block on the stack when looking for places to attach a dragging stack. 2016-03-11 18:07:26 -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
Neil Fraser
2a1ffa11c4 Add undo/redo. Also refactor connections.
Bugs in undoing mutators and renaming variables.
2016-03-03 17:48:54 -08:00
Tim Mickel
470d10af10 Add RTL icon positioning and flip property 2016-03-03 17:32:22 -05:00
Tim Mickel
5bdc3070b9 Merge branch 'upstream' into feature/upstream-merge
# Conflicts:
#	blockly_compressed_vertical.js
#	blockly_uncompressed_vertical.js
#	core/connection.js
#	tests/jsunit/index.html
#	tests/playground.html
2016-03-03 11:55:59 -05:00
Neil Fraser
5097963cb1 Reduce code duplication in 'if' block. 2016-03-01 18:21:02 -08:00
Rachel Fenichel
6e30464108 ghost blocks on insertion on a previous connection 2016-03-01 16:48:48 -08:00
Rachel Fenichel
391e449c9c Merge branch 'develop' into feature/ghost_blocks 2016-03-01 15:18:49 -08:00
Tim Mickel
4c3698c067 Add mechanism in Block for secondary and tertiary colours 2016-03-01 15:31:00 -05:00
Neil Fraser
4c542240e2 Provide default getVars and renameVar functions. Issue 265. 2016-02-27 12:28:32 -08:00
Neil Fraser
b567d6b0d7 Allow shadow blocks to be edited. 2016-02-26 00:22:31 -08:00
Rachel Fenichel
6a9e82217b ghost blocks 2016-02-23 14:46:04 -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
Neil Fraser
6e6a04b879 Add X/Y coordinates and block ID to create event. 2016-02-16 21:57:22 -08:00
Neil Fraser
5297344a8b Fix RTL XML. 2016-02-16 13:04:47 -08:00
Neil Fraser
a0a61d2f33 Add event grouping. Add event monitoring to playground. 2016-02-12 22:09:21 -08:00
Neil Fraser
1d44036cf9 Add missing move when unshadowing and missing XY when deleting. 2016-02-12 19:34:51 -08:00
Neil Fraser
0fab13400a Fire function events instead of DOM events. 2016-02-11 21:40:33 -08:00
Neil Fraser
acd6af1c45 Add Move event. 2016-02-02 00:28:49 -08:00
Neil Fraser
0027d9294a Double speed of workspace drag. 2016-02-01 16:13:05 -08:00
Neil Fraser
211595075e Make colour optional in JSON. Add ;/n in generator stub. 2016-01-28 14:25:38 -05:00
Andrew Sliwinski
df8955089f WIP on horizontal block rendering 2016-01-27 14:12:37 -05:00
Neil Fraser
9804b31bb0 Allow easier addition of custom loops or functions. 2016-01-21 18:16:25 -08:00
Neil Fraser
c429949a4e Add Create, Delete, and Change events.
Not counting change for mutators.
2016-01-20 19:11:03 -08:00
Neil Fraser
36fe3994c9 Misc cleanup. 2016-01-15 15:36:06 -08:00
Neil Fraser
554244fd35 Allow string hues. 2015-12-18 19:45:39 -08:00
Neil Fraser
e1acdf5caf Allow RGB colours. 2015-12-13 19:13:05 +01:00
Neil Fraser
3b3ef79fbd Create block id database. 2015-12-09 10:02:42 +01:00
Neil Fraser
b2bbde04a1 Support custom CSS in JSON. 2015-12-08 10:07:56 +01:00
Neil Fraser
6acaf35967 Add workspace.newBlock, deprecate Blockly.Block.obtain. 2015-12-07 16:40:45 +01:00
Troy McKinnon
11906b7535 improve type annotations 2015-11-10 17:28:46 -06:00
Neil Fraser
54ffdc5926 Don't allow shadow blocks to be deleted. 2015-10-21 12:58:52 -07:00
Neil Fraser
799835943a Shadow Blocks 2015-10-06 18:09:27 -07:00
Neil Fraser
c82c460da8 Move icon reference to block SVG.
No functional change.
2015-09-30 19:33:05 -07:00
Troy McKinnon
6d6716c3d3 adding type annotations 2015-09-22 13:32:14 -05:00
Neil Fraser
2d60d94941 Re-allow output coupled with next statement. 2015-09-20 14:37:28 -07:00
Neil Fraser
ad1d1261c8 Duplicate should spread blocks out like copy and paste do. 2015-09-18 18:46:19 -07:00
Neil Fraser
0061482977 Disallow output coupled with next statement. 2015-09-17 16:47:13 -07:00
Neil Fraser
83abc988a7 Remove unused changeOutput func. 2015-07-22 17:17:36 -07:00
Neil Fraser
09f5ac6f7b Remove non-functioning workspace long-click. 2015-07-13 17:48:50 -07:00
Neil Fraser
e0f90e6e33 Adding more type documentation. 2015-07-13 15:03:22 -07:00