Commit graph

12 commits

Author SHA1 Message Date
Andrew Sliwinski
be9d5fefed Merge from Upstream Blockly ()
* WIP merge from upstream google/blockly

* fixing some merging bugs. Getting the drag surface to work, updating some function calls, etc.

* make the trash can lid animate again and fix the cursor to show an x when things will be removed.

* Fix text rendering logic in fields

* Hand apply some more changes from blockly flyout.js to flyout_base.js.

Also revert 08efd1381c
in scratch-blocks since it breaks variables and there is more work fenichel is planning
to do here.

* Fix drop-down field rendering

* Resolve issue with text input field widths on init

* Remove unused blockly (built) files

* Remove unused language files

* Resolve lint issues and rebuild

* Add blockly build targets to cleanup script

* Return 0 if 'this.arrow_' does not exist in a dropdown field

* Remove unused / irrelevant comments
2017-02-02 14:17:43 -05:00
Tim Mickel
f2711daa52 Make click-cancelling logic consistent for flyout () 2016-11-07 14:10:36 -05:00
Rachel Fenichel
844b7771e2 Merge branch 'develop' of https://github.com/google/blockly into feature/merge_nov_1 2016-11-01 18:00:26 -07:00
Rachel Fenichel
639c6ecac1 Fix multitouch bug on flyout drag: don't reset flyout drag mode before clearing touch identifier. 2016-10-28 16:42:46 -07:00
Rachel Fenichel
6004db3613 More doc cleanup 2016-10-25 13:01:16 -07:00
Tim Mickel
f318d6a7ea Tweaks for clicking blocks in toolbox ()
* Make a copy of listeners (fix ), allow ID lookup in flyout

* Move flyout cursor change to when block drags

* Fire a stack-click event in flyout, to match workspace
2016-10-13 17:09:41 -04:00
Rachel Fenichel
d7e92532a9 lint 2016-10-07 10:15:41 -07:00
Rachel Fenichel
dc0eedd3da cleanup and some coordinate fixes 2016-10-06 14:49:15 -07:00
Rachel Fenichel
aea601960d Merge branch 'feature/scratch-toolbox' into feature/multitouch_and_toolbox 2016-10-04 14:40:10 -07:00
Rachel Fenichel
c41eb66ff1 Rename horizontal and vertical flyout files 2016-09-20 17:33:50 -07:00
Rachel Fenichel
c565f247e4 move checkboxes to only be in vertical flyouts 2016-09-09 12:44:33 -07:00
Rachel Fenichel
a3181b691d flyout.js -> flyout_base.js, fixes for coordinate problems 2016-09-09 12:11:02 -07:00
Renamed from core/flyout.js (Browse further)