Commit Graph

107 Commits

Author SHA1 Message Date
Rodrigo Queiro
5d7b2074a4 Add GAP_X/Y to the flyout
This makes it easy for users to customise the spacing in the flyout,
without having to repeat the same value of "sep" for every block.
2016-08-24 15:01:32 +02:00
Rachel Fenichel
3e4efe9424 Make blocks appear in the rtl horizontal flyout 2016-08-22 17:09:14 -07:00
Rachel Fenichel
d2ce081dc4 Move functions for updating variables on a workspace into workspace.js, and some lint 2016-08-17 16:07:50 -07:00
Rachel Fenichel
a2b3a3638a Merge branch 'develop' into feature/variable_management 2016-08-12 14:32:26 -07:00
Rachel Fenichel
dc02dfb8ff Separators specified in toolbox XML should replace, not add to, previous gaps. 2016-08-09 17:51:50 -07:00
Rachel Fenichel
3998ecec3a Parse separators in xml in always-open flyouts 2016-08-09 16:34:59 -07:00
Rachel Fenichel
350e1ff2cc Merge remote-tracking branch 'upstream/develop' into feature/variable_management_merge_develop 2016-08-08 16:58:51 -07:00
Rodrigo Queiro
373b68d8b0 Add JSDoc for flyout drag state variables 2016-07-20 10:24:15 +02:00
Rachel Fenichel
f040929bd8 Merge remote-tracking branch 'upstream/develop' into feature/merge_develop 2016-07-15 13:07:07 -07:00
Rodrigo Queiro
74e905c611 Check flyout in isDragging()
We also have to record startFlyout_ on background scrolls - before
dragMode_ wasn't being reset by terminateDrag() for background scrolls,
which would suppress clicks from that point on.

Fixes #476.
2016-07-15 10:35:45 +02:00
Rodrigo Queiro
d3d0ca4fd0 Record whether the workspace has been dragged (#475)
* Record whether the workspace has been dragged

This fixes #473 by differentiating between a touch on an unmovable block
and using it to drag the workspace.

* Remove isScrolling and add DRAG_BEGIN

Applied after PR review.
2016-07-12 11:34:02 -07:00
Neil Fraser
e849c93db9 Merge branch 'master' into develop 2016-07-08 16:52:18 -07:00
Rachel Fenichel
13c6c63daa Create variables from the flyout 2016-07-07 14:39:45 -07:00
Rachel Fenichel
94e0a7ff4c Change params of flyout.layout 2016-07-07 14:38:04 -07:00
Rachel Fenichel
cb3bef8f32 Flyout button with click handler 2016-07-07 14:37:12 -07:00
Rachel Fenichel
e371da3031 First pass at svg button in flyout 2016-07-07 14:35:30 -07:00
Rodrigo Queiro
589f6ae13f Re-enable events even when an exception is thrown
This prevents a recoverable exception permanently disabling events. This
could be caused by calling domToWorkspace() to load a corrupt program.
2016-06-29 14:46:06 +02:00
Rodrigo Queiro
0454c93ff8 Clean up #417 after review 2016-06-29 12:26:11 +02:00
Rodrigo Queiro
4e3faf0158 Revise handling of mouse events on flyout blocks
- allows scrolling by dragging a block up and down
- dragging a block towards the workspace creates it
- dragging a block any direction in a non-scrollable flyout creates it
- dragging a shadow block works properly
- clicks on fields in non-closeable flyouts always open editors
- clicks in closeable flyouts create the block but don't open editors

Fixes #385 and fixes #405.
2016-06-29 11:29:03 +02:00
Rodrigo Queiro
2dcb6cb68b Ignore mouseup at end of drag with isDragging (#416)
This includes both block drags and workspace scrolls and fixes #404. I
used isDragging rather than checking the origin of click so that it can
easily be extended to the case where the flyout is scrolled by dragging
a block, a la LLK/scratch-blocks#206.
2016-06-28 18:11:48 -07:00
rachel-fenichel
aca074891d Fix some problems with flyout rendering (#461) 2016-06-27 17:27:08 -07:00
Rachel Fenichel
8f601345bb cache delete areas instead of recalculating them onMouseDown 2016-06-17 12:39:18 -07:00
picklesrus
33ba6e8fad Fix #423 by calling workspace's resize when the flyout reflows. (#430) 2016-06-14 10:13:03 -07:00
Rodrigo Queiro
0585a667ec Fix typo in flyout.js (#402) 2016-06-07 09:54:57 -07:00
Rodrigo Queiro
736ff96ead Fix typo in flyout.js (#403) 2016-06-07 09:54:37 -07:00
picklesrus
213469a479 Change the blockly workspace resizing strategy. (#386)
* Add a new method to be called when the contents of the workspace change and
the scrollbars need to be adjusted but the the chrome (trash, toolbox, etc)
are expected to stay in the same place.

Change a bunch of calls to svgResize to either be removed or call the new
method instead.  This is a nice performance win since the offsetHeight/Width
call in svgResize can be expensive, especially when called as often as we do -
there was some layout thrashing.

This also paves the way for moving calls to recordDeleteAreas
(which is also expensive) to a more cacheable spot than on every
mouse down/touch event.

of things (namely the scrollbars)

* Fix size of graph demo when it first loads by calling svgResize.
The graph starts with fixed width and was relying on a resize event
to fire (which I believe was removed in commit
217c681b86).

* Fix the resizing of the code demo.  The demo's tab min-width used to
match the toolbox's width was only being set on a resize event, but
commit 217c681b86 changed how that worked.

* Fix up some comments.

* Use specific workspaces rather than Blockly.getMainWorkspace().

* Make workspace required for resizeSvgContents and update
some calls to send real workspaces rather than ones that are
null.

Remove the private tag on terminateDrag_ because it is only
actually called from outside the BlockSvg object.

* Remove a rogue period.

* Recategorize BlockSvg.terminateDrag_ to @package instead of @private so that
other developers don't use it, but it still can be used by other Blockly classes.

* Add a TODO to fix issue #307.

* Add @package to workspace resizeContents.
2016-06-03 16:11:55 -07:00
rachel-fenichel
e14e42192c Merge pull request #379 from rachel-fenichel/cleanup/more_lint
More lint and eslint configuration.
2016-05-25 15:36:03 -07:00
Rachel Fenichel
4841f136f1 More lint and eslint configuration. 2016-05-25 15:35:11 -07:00
Rachel Fenichel
6208ba62fb Rename a variable for clarity 2016-05-25 13:47:19 -07:00
Neil Fraser
29e10e0976 Routine recompile. 2016-05-14 03:50:35 -07:00
Rachel Fenichel
f38b43419c Combine horizontal and vertical flyout scrolling 2016-05-13 16:07:53 -07:00
Rachel Fenichel
65aceaa1dc Fix docstrings and add horizontal scrolling. 2016-05-13 15:30:47 -07:00
Rachel Fenichel
666536807a Add comments; scroll to start for always open flyout 2016-05-13 14:26:32 -07:00
Rachel Fenichel
8cfd48554a clean up margins 2016-05-11 16:40:42 -07:00
Rachel Fenichel
e0cda58701 fix variable naming in createnewblock. 2016-05-11 15:15:12 -07:00
Rachel Fenichel
77a8b92ac2 Merge branch 'develop' into feature/horizontal_toolbox_port 2016-05-11 11:44:38 -07:00
Neil Fraser
217c681b86 Use direct call to svg resize rather than event. Also fix issue #296. 2016-05-04 15:00:57 -07:00
Rachel Fenichel
8f51fb1e48 remove duplicate code 2016-05-02 15:23:02 -07:00
Rachel Fenichel
cb1188af45 Add TODOs 2016-04-27 10:31:01 -07:00
Rachel Fenichel
2591e12a46 Fix janky scrolling in vertical case 2016-04-26 18:16:26 -07:00
Rachel Fenichel
60dfbb455e offset correctly when opening for the first time 2016-04-26 15:10:49 -07:00
Rachel Fenichel
a27fe99be4 Merge branch 'develop' into feature/horizontal_toolbox_port 2016-04-25 14:25:36 -07:00
Neil Fraser
6c0bf9f966 Routine recompile. 2016-04-21 06:05:25 -07:00
Neil Fraser
9e034b2716 Merge pull request #332 from picklesrus/develop-hatblock
Take into account height of the hat for hat blocks.
2016-04-21 05:27:35 -07:00
Neil Fraser
e65d6964bd Merge pull request #342 from rachel-fenichel/cleanup/flyout_listeners
Decompose functions in flyout.  Does not change behaviour.
2016-04-21 05:19:00 -07:00
Neil Fraser
703ac981da Routine recompile. 2016-04-20 16:44:13 -07:00
rachel-fenichel
c8f98a7ded Decompose functions in flyout. Does not change behaviour. 2016-04-20 14:14:53 -07:00
Neil Fraser
52eb6adcc2 Add click events to non-closing flyout blocks. Issue #337. 2016-04-20 05:03:05 -07:00
rachel-fenichel
ac15b8b179 Use Infinity instead of a large number 2016-04-19 14:37:50 -07:00
rachel-fenichel
8882c727a3 remove log statements 2016-04-19 14:27:13 -07:00