Commit graph

56 commits

Author SHA1 Message Date
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
Katelyn Mann
b11bd4fb71 Remove Blockly.removeAllRanges and replace it with calls to add/remove
css to mark text as unselectable instead.  I can't prove this is
significantly faster with numbers since the call to setup the time out
costs ~.1ms and the call when the timer fires is ~.05.  This happens on almost
every mouse event though.  Plus, it seems to remove a flicker of highlighting when
frames are skipped and keeps scrolling via the scrollbar from highlighting.
2016-03-28 10:06:43 -07:00
Rachel Fenichel
b4256247fb fix annotations and rename 2016-02-23 14:55:15 -08:00
Rachel Fenichel
4230dd2b83 Fix checking deletion rectangles and fix toolbox config. 2016-02-19 16:23:32 -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
Rachel Fenichel
c0e28dcb15 switch to an enum 2016-02-17 16:32:31 -08:00
Rachel Fenichel
8f23434703 render toolbox and flyout at start/end in horizontal mode 2016-02-17 11:02:26 -08:00
Neil Fraser
6e6a04b879 Add X/Y coordinates and block ID to create event. 2016-02-16 21:57:22 -08:00
Rachel Fenichel
7cd8135125 Render toolbox and flyout at start/end in vertical mode. 2016-02-12 14:48:13 -08:00
Rachel Fenichel
3462a5a2c1 position toolbox 2016-02-12 10:57:33 -08:00
Rachel Fenichel
803d0e72b2 Turn toolbox sideways in the horizontal playground. 2016-02-11 14:46:51 -08:00
rachel-fenichel
0ccdf83e18 Merge pull request #52 from rachel-fenichel/feature/horizontal_flyout
Horizontal flyout rendering
2016-02-11 11:03:05 -08:00
Rachel Fenichel
39b4980867 horizontal flyout rendering. 2016-02-10 17:09:20 -08:00
Rachel Fenichel
5692ddb591 optionally show icons instead of names for toolbox categories 2016-02-08 17:20:28 -08:00
Neil Fraser
5ca8b36cfc Allow <sep> to be used to add gaps between blocks. 2016-02-05 18:41:47 -08:00
picklesrus
80d8d55315 Cache delete area rectangle bounds in the on mouse down event
to avoid getting it for every mouse move event. The delete areas
won't change while the user is dragging blocks around.
Also switch calculations for delete area inclusion to be done in
client coordinates so we don't have to convert to svg coordinates on
every mouse move event.
This should speed up dragging blocks a bunch.
2016-02-03 15:36:39 -08:00
Rachel Fenichel
1672e28f12 Horizontal toolbox layout and option to enable it. 2016-01-26 12:35:50 -08:00
Neil Fraser
3bce368115 Simplify workspace options by removing svg property. 2016-01-07 17:01:01 -08:00
Neil Fraser
e1acdf5caf Allow RGB colours. 2015-12-13 19:13:05 +01:00
Neil Fraser
383ca8258c Fix toolbar with both colours and subcategories.
Also fix updating of toolbar after loading Blockly.
2015-12-01 12:28:19 -08:00
Ke, Mingze
ff6d06a735 Fixed toolbox categories don't support touch. Issue #202. 2015-11-09 18:08:13 +08:00
Neil Fraser
1026d353ce Allow blocks in toolbox to be disabled individually. 2015-10-21 15:21:51 -07:00
Neil Fraser
c83faa3314 Fix colours on collapsed categories. 2015-10-14 15:00:32 -07:00
Neil Fraser
3d2e9b3a17 Move category colours to be on left. 2015-10-14 14:02:09 -07:00
Neil Fraser
b503dd7d80 Add shadow blocks and category colours to code demo. 2015-10-12 21:00:29 -07:00
Neil Fraser
59cadcb2d7 Add optional colour tabs on toolbox categories. 2015-10-12 17:30:41 -07:00
Neil Fraser
4dffad0dad Improve 'clean up' spacing. 2015-10-12 16:14:03 -07:00
Neil Fraser
53f5424801 Skc memory leaks (PR #159) 2015-08-20 15:46:44 -07:00
Allison Lamm
02fa8cb605 more type annotation updates 2015-08-10 14:34:42 -05:00
Neil Fraser
782676071a Fix page scrolling in flyout. 2015-07-14 17:04:47 -07:00
Neil Fraser
bcebb0776b Allow flights to be initially expanded in toolbox. 2015-07-09 11:57:06 -07:00
Neil Fraser
d819db2acf Lint corrections. 2015-07-02 19:41:10 -07:00
Neil Fraser
8202ebf07d Dispose of toolbox when workspace is disposed. 2015-06-04 12:04:43 -07:00
Neil Fraser
e8ab929b6a Fix visibility changes with toolbox. 2015-05-22 17:08:59 -07:00
Neil Fraser
767d7fe556 Add expanded property to toolbox XML. 2015-05-22 13:10:58 -07:00
Neil Fraser
6fdab711b2 Fix several RTL bugs. 2015-05-19 12:02:49 -07:00
Neil Fraser
ede636361d Simplify workspace resizing. 2015-04-28 17:55:45 -07:00
Neil Fraser
17961f7f58 Support multiple Blockly instances. 2015-04-28 13:51:25 -07:00
Neil Fraser
29976c4c4d Remove outside border from Blockly (issue 92). 2015-04-07 20:27:26 -07:00
Neil Fraser
afda263f23 Lint warning cleanup. 2015-03-26 20:47:36 -07:00
Neil Fraser
764452eb10 Squeltch double-click highlighting on workspace and toolbox. 2015-03-17 12:20:56 -07:00
Neil Fraser
b91471abdb Scroll flyout to top when changing category. 2015-02-27 17:01:24 -08:00
Neil Fraser
c9addf7e31 Improve accuracy of goog.require calls. 2015-02-06 15:27:25 -08:00
Neil Fraser
816aa86992 Replace <hr> with <sep></sep> (issue 50). Alphabetize CSS. 2015-01-23 18:24:15 -08:00
Neil Fraser
1c39a638e3 Lint fixes. 2015-01-22 15:58:10 -08:00
Neil Fraser
8d358b96a0 Toolbox no longer hardcoded to main workspace. 2015-01-12 15:11:24 -08:00
Neil Fraser
4973db4df6 Use goog.global instead of this or window. 2014-12-23 16:44:00 -08:00
Neil Fraser
c9169285d9 Add red 'X' to mouse cursor if blocks are over toolbox. 2014-12-02 15:00:10 -08:00
Neil Fraser
0a191c1c50 Convert Blockly.Toolbox from a singleton to an instance. 2014-11-29 15:41:27 -08:00
Neil Fraser
5aed33b678 Add separators to toolbox. 2014-11-24 17:34:27 -08:00