scratchfoundation/scratch-blocks
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-blocks.git synced 2025-08-28 22:10:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions
1136 commits 78 branches 380 tags 120 MiB
Commit graph

74 commits

Author SHA1 Message Date
Rodrigo Queiro
8415db4085 Hide dropdowns when scrolling the flyout 
Fixes #302. This hides both WidgetDiv and DropDownDiv without animation,
otherwise they can float over other blocks as they're animating out.
 2016-05-09 09:03:50 -07:00
Tim Mickel
4feb56c188 Add click events to non-closing flyout blocks. (#310) 
* Add click events to non-closing flyout blocks. Issue #337.

# Conflicts:
#	core/flyout.js

* Recompile
 2016-05-03 15:43:29 -04:00
Rachel Fenichel
8d539f56f3 Preserve create and delete events in the flyout 2016-04-27 11:33:09 -07:00
Rachel Fenichel
9dd2b00074 Avoid some unnecessary calls to resize() 2016-04-26 13:30:27 -07:00
Tim Mickel
0ca0b26037 Drop-down and field bug fixes (#285) 
* Only reset icon menu field colour if block still exists

* Hide drop-downs and WidgetDiv on block creation
 2016-04-25 15:38:10 -04:00
Tim Mickel
366734c0cb Add flyout scroll mode per #206 
* Add flyout dragMode_ and function to determine intention

* A click on the block rect is also checked for mode
 2016-04-23 12:59:38 -04:00
Tim Mickel
0fb21a90fe Separate CORNER_RADIUS from block positioning in flyout; set radius to 0 (#219) 
* Separate CORNER_RADIUS from BLOCK_MARGIN

* Set flyout CORNER_RADIUS to 0 by default

* Fix comment
 2016-04-14 17:58:39 -04:00
Rodrigo Queiro
7ec2f4b624 Merge pull request #204 from drigz/bugfix/toolbox-scroll-cutoff 
Include margins in the toolbox content size
 2016-04-14 10:05:54 +02:00
rachel-fenichel
d1c9fcd83c Rename variables 2016-04-12 11:37:47 -07:00
Rodrigo Queiro
2dc9caf53a Include margins in the toolbox content size 
Before the size reported by the SVG was used, which didn't include the
margins and underestimated the true size, meaning the right-hand edge of
the last block being cut off.
 2016-04-12 15:50:07 +02:00
rachel-fenichel
93f48dd098 Fix dragging out of flyout when workspace is zoomed 2016-04-11 15:42:39 -07:00
Tim Mickel
3f025a6553 Quick fix for broken Blockly.Flyout variable scope (#193) 2016-04-11 14:37:14 -04:00
Tim Mickel
cd27b60d5e Only create new blocks in flyout at certain angle #179 (#183) 
* Only create new blocks in flyout at certain angle

* Updating direction check to be generic to position

* Update comment about direction check

* Add comment about atan2 direction

* Improve documentation, naming for flyout angles.

* Shortening dragTowardWorkspaceOrthogonalAngleRange_
 2016-04-11 14:21:55 -04:00
Tim Mickel
9f313251d3 Simplify model by removing isOnDragSurface_ 2016-04-07 22:58:05 -04: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
Neil Fraser
ac0b5e7871 Use ENUM for dragMode. Blocks no longer sticky when created from disappearing flyout. 2016-03-29 08:36:11 -07: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
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
6eb905716f Fix horizontal RTL flyout positioning 
this.width_ offset was unnecessary and breaking things, because it was only calculated after the first reflow.
 2016-03-03 17:06:50 -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
4d4521bed3 Fix scaled RTL coordinates. 2016-02-25 11:08:59 -08:00
Neil Fraser
e6db687234 Fix startScale on workspaces without a fixed flyout. 2016-02-24 19:27:03 -08:00
Neil Fraser
f0d04ba16b Fix RTL flyout events. 2016-02-24 16:52:55 -08:00
rachel-fenichel
48a449b63a Merge pull request #67 from rachel-fenichel/feature/multi-playground 
Additional playground with multiple instances of blockly
 2016-02-23 15:46:19 -08:00
Rachel Fenichel
1bbc386ec8 Round flyout corners properly. 2016-02-19 17:37:18 -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
Neil Fraser
0fab13400a Fire function events instead of DOM events. 2016-02-11 21:40:33 -08:00
Rachel Fenichel
803d0e72b2 Turn toolbox sideways in the horizontal playground. 2016-02-11 14:46:51 -08:00
Rachel Fenichel
e00fb1a590 Style fixes 2016-02-11 11:01:46 -08:00
Rachel Fenichel
39b4980867 horizontal flyout rendering. 2016-02-10 17:09:20 -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
Neil Fraser
0585cea1e3 Fix capacity filter to reenable blocks in non-closing flouts. 2016-02-02 19:53:52 -08:00
Rachel Fenichel
1672e28f12 Horizontal toolbox layout and option to enable it. 2016-01-26 12:35:50 -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
4253de041a Remove old realtime. 2016-01-08 13:03:22 -08:00
Neil Fraser
a5ea93a1db Allow comments in flyouts. 2015-12-17 14:16:04 -08:00
Neil Fraser
b10ef6da48 Allow custom gaps to be specified between toolbox blocks. 2015-10-25 22:20:08 -04:00
Neil Fraser
1026d353ce Allow blocks in toolbox to be disabled individually. 2015-10-21 15:21:51 -07:00
Neil Fraser
a485e63df2 Allow zooming of non-scrolling workspaces. 2015-10-21 14:38:39 -07:00
Neil Fraser
3f8e586fe8 Use prototypes for primitive properties. 2015-09-12 19:31:22 -07:00
Neil Fraser
e4c902a105 Fix RTL alignment of new blocks when zoomed. 2015-09-02 00:09:49 +01:00