Commit Graph

3778 Commits

Author SHA1 Message Date
rachel-fenichel 21fea1279c Merge pull request #557 from google/feature/variable_management
Integrate variable management into develop.
2016-08-18 15:56:18 -07:00
Rachel Fenichel 7a7932acc7 No longer drops mouseUps; fixed lint per neil's comments 2016-08-18 14:46:28 -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 19722e2350 Use a Blockly.Msg for button text 2016-08-16 16:53:53 -07:00
Katelyn Mann 33e9d75457 Fix for #521.
Add a isMutator member similar to isFlyout to workspace_svg so it knows whether
it is mutator or not. Allow blocks to access that property so that they can recalculate
coordinates appropriately.
2016-08-16 11:19:29 -07:00
rachel-fenichel c7dea98e88 Merge pull request #534 from picklesrus/develop-screenctm-bugs
Fix for #498.  Recalculate the things that use screen coordinates (de…
2016-08-12 17:15:20 -07:00
Katelyn Mann 244733467d Fix for #498. Recalculate the things that use screen coordinates (delete area and
screen transformation matrix) when a scroll happened.
This is not done using a scroll handler since the update
is expensive (getScreenCTM and getClientBoundingRect) and we don't need to do it
until the scroll is done and the user is interacting with blocks again.
2016-08-12 16:56:22 -07:00
Rachel Fenichel a2b3a3638a Merge branch 'develop' into feature/variable_management 2016-08-12 14:32:26 -07:00
rachel-fenichel aa4014d933 Merge pull request #542 from rachel-fenichel/feature/procedure_variables
Disallow deleting variables that are used in the definition of a function
2016-08-12 14:23:29 -07:00
Rachel Fenichel d50f806624 Create variables on block creation 2016-08-11 17:31:19 -07:00
Rachel Fenichel 775e298c2c Disallow deleting variables that are used in the definition of a function 2016-08-11 17:10:15 -07:00
Rachel Fenichel c7a5944ea3 Create variables from procedure definitions 2016-08-11 14:59:11 -07:00
rachel-fenichel dd0e88b28b Merge pull request #537 from picklesrus/develop-dispose-injectiondiv
Fix #536 by changing workspace's dispose method to remove the injectD…
2016-08-11 11:26:11 -07:00
Katelyn Mann bbd57a9a16 Fix #536 by changing workspace's dispose method to remove the injectDiv wrapper of the
svg. The wrapper div was introduced in #512.
2016-08-11 11:00:02 -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 65d785a86d New message for deletion; block dispose is a noop if it's already been deleted 2016-08-09 17:17:08 -07:00
Rachel Fenichel 3998ecec3a Parse separators in xml in always-open flyouts 2016-08-09 16:34:59 -07:00
Rachel Fenichel cdbfce87de Make disposeUses private 2016-08-09 11:30:32 -07:00
Rachel Fenichel bf6220cb42 Ask user for confirmation when deleting multiple uses of a variable. 2016-08-09 10:45:26 -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
Neil Fraser 875ffad42c Fix selection bug on bumps caused by mutator actions. 2016-08-03 18:33:18 -07:00
Sean Lip d362c73a04 Allow a placeholder for empty fields to be specified when generating block descriptions. (#509)
* Allow a placeholder for empty fields to be specified when generating block descriptions.

* Correctly handle recursive block stringification.
2016-08-03 17:47:34 -07:00
Emma Dauterman 831a14e1e4 Made Blockly.WorkspaceSvg.cleanUp public 2016-08-02 17:18:12 -07:00
rachel-fenichel 0765d9cbd6 Merge pull request #482 from svbatalov/toolbox-hscroll-patch-event
Scroll toolbox with LEFT/RIGHT in horizontalLayout
2016-08-02 12:44:16 -07:00
Jean-Michel DECORET 927cabe992 Develop - Modals support (#512)
* * apply bootstrap3 integration fixes

* Injection subcontainer

Include svg and div into a master container, which allow css better
positioning (overflow scrolling problem)

* * Fix toolbox positioning (rtl and ltr). Because toolbox if relative to injection div, only adjust it to left (ltr) or right (rtl) edge

* * fix style (thanks to @NeilFraser)

* * revert msg files
2016-07-30 20:36:35 -07:00
Neil Fraser 1aeb26860a Routine recompile. 2016-07-26 17:23:57 -07:00
Rachel Fenichel e8ebc5441f Handle each changed touch as a separate touch event 2016-07-21 14:07:03 -07:00
Rachel Fenichel 6b7965a727 Ignore everything but the first touch stream 2016-07-20 17:03:24 -07:00
picklesrus d215314ffd Revert "Convert createDom calls to createUntypedDom" 2016-07-20 15:21:45 -07:00
Rodrigo Queiro 373b68d8b0 Add JSDoc for flyout drag state variables 2016-07-20 10:24:15 +02:00
Batalov Sergey 34530666fb Small fixes 2016-07-20 08:49:28 +05:00
Neil Fraser 19005ca3bf Routine recompile. 2016-07-19 16:44:12 -07:00
Neil Fraser 877aa7522d Fix mutator/warning/comment icons to highlight on mouse over only if they are usable. 2016-07-19 16:34:48 -07:00
rachel-fenichel b4a938f804 Merge pull request #478 from drigz/bugfix/476
Check flyout in isDragging()
2016-07-19 10:58:48 -07:00
Batalov Sergey 2afd0171a1 Scroll toolbox with LEFT/RIGHT in horizontalLayout 2016-07-19 09:27:58 +05:00
Rodrigo Queiro d9a3569706 Convert createDom calls to createUntypedDom (#481)
Unless they could be converted to use goog.dom.TagName, in which case do
that. createDom is going to require goog.dom.TagName member as the
tagName parameter. This change prepares for that.
2016-07-18 07:18:17 -07:00
Neil Fraser e03a4a9e30 Fix creation of uneditable blocks. Issue #324. 2016-07-18 00:54:34 -07:00
Neil Fraser 5c2c4d8400 Refactor validators to survive aggressive Closure compression. 2016-07-15 20:59:20 -07:00
Neil Fraser 8c48436c8f Fix validation on number field. 2016-07-15 20:06:01 -07:00
Neil Fraser 5852f8e7e1 Fix nested disabled blocks in disableOrphans. 2016-07-15 20:06:01 -07:00
Neil Fraser 4f498dc99c Make tooltips reflect from-end indexing behaviour. 2016-07-15 14:55:05 -07: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
Rachel Fenichel dfe61087f0 Correctly update variable list when pasting code 2016-07-14 15:39:41 -07:00
Neil Fraser 7a92facc3a Fix angle field. 2016-07-13 16:58:43 -07:00
Rachel Fenichel 75e06de477 Use instanceof to distinguish between blocks and workspaces. 2016-07-13 12:50:44 -07:00
Neil Fraser 13d9ecdca0 Merge branch 'master' into develop 2016-07-12 11:35:08 -07: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 823bf3c5da Allow substituted strings in interpolation. 2016-07-12 11:24:39 -07:00
Rodrigo Queiro ab03c4f411 Remove out-of-date comment (#474)
This comment made sense [before multiple workspace support](https://github.com/google/blockly/blob/67140282a08b10d0beb8d842a2dc35beadc5d5e0/core/blockly.js#L297), where it was near a (Blockly.readOnly || isTargetSvg) check. Now, this logic is implemented in BlockSvg.onMouseDown_() instead.
2016-07-11 16:43:29 -07:00