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
2241 commits 78 branches 380 tags 120 MiB
Commit graph

133 commits

Author SHA1 Message Date
Ray Schamp
c07d457cac Fix updateToolbox 
I think this method broke in a merge.  We are recreating the category DOM element on init, but this seems to be the simplest solution for now.

Thanks to @rachel-fenichel for helping fix it.
 2017-02-15 14:53:16 -05:00
Andrew Sliwinski
be9d5fefed Merge from Upstream Blockly (#776) 
* 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
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
afca4264ca Add option to style flyout buttons as labels 2016-10-31 15:20:16 -07:00
Rachel Fenichel
703bd96f7e Allow creation of buttons with developer-designated callbacks 2016-10-31 14:24:00 -07:00
Rachel Fenichel
6004db3613 More doc cleanup 2016-10-25 13:01:16 -07:00
Rachel Fenichel
0445783cad Toolbox jsdoc 2016-10-25 12:49:22 -07:00
Rachel Fenichel
7cd796a072 Scroll to start when opening new category 2016-10-21 13:03:48 -07:00
picklesrus
3625093ce1 Cache height of the toolbox category box since it does not change. Also only call hideWithoutAnimation on the dropdown div if it is visible (Bug #549). (#698) 2016-10-20 22:28:54 -04:00
Rachel Fenichel
0537f4829e Merge pull request #685 from trodi/toolbox-typing 
Add a few missing type definitions
 2016-10-18 17:31:54 -07:00
Rachel Fenichel
0d9ac67920 Merge pull request #597 from svbatalov/toolbox-hscroll-patch-event 
Fix toolbox scrolling in horizontal layout
 2016-10-17 13:12:14 -07:00
Tim Mickel
1a3ec368e6 Tweaks to Scratch-style toolbox styling (#669) 
* Minor style tweaks to toolbox

* Category ordering to match Blockly XML
 2016-10-07 15:36:21 -04:00
Rachel Fenichel
d7e92532a9 lint 2016-10-07 10:15:41 -07:00
Neil Fraser
7928fac3ce Collapse the five 0/1-based index flags into one option. 2016-10-06 17:54:43 -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
Troy McKinnon
ad3541992e add a few type definitions 2016-09-30 16:26:44 -05:00
Rachel Fenichel
ed983333eb bindEventWithChecks_ for internal use, and bindEvent_ with old behaviour but deprecated 2016-09-23 13:46:11 -07:00
Rachel Fenichel
ba1238812f Revert "Revert "Ignore everything but the first touch stream"" 2016-09-23 13:36:53 -07:00
Rachel Fenichel
b2faa41eb1 Revert "Ignore everything but the first touch stream" 2016-09-22 15:26:52 -07:00
Rachel Fenichel
029148dd25 Merge branch 'develop' of https://github.com/google/blockly into merge_sept_22 2016-09-22 14:55:57 -07:00
Rachel Fenichel
1d1321a00d Changes per neil's comments, plus a rebuild 2016-09-21 16:25:44 -07:00
Rachel Fenichel
10c6d998c3 Get rid of a console.trace and allow drops on the toolbox 2016-09-20 15:10:33 -07:00
Rachel Fenichel
5232f8f1bf Get rid of reflow since scratch-style toolboxes are fixed size. 2016-09-08 16:54:10 -07:00
Rachel Fenichel
b771d8daf4 Cleanup 2016-09-07 18:14:05 -07:00
Rachel Fenichel
109e4bb352 Move code to touch.js 2016-09-07 17:42:09 -07:00
Rachel Fenichel
a979a422e4 Merge branch 'develop' of https://github.com/google/blockly into merge_sept_01 2016-09-01 16:52:08 -07:00
Rachel Fenichel
1c025672b3 Clear touch identifier at the ends of more drags. Includes flyout background, right-clicks on blocks, and loading sounds. 2016-08-31 15:56:37 -07:00
Rachel Fenichel
e4fcd8bf5c reset touch identifier at the end of a toolbox click 2016-08-30 15:28:47 -07:00
Tim Mickel
f1aac859e3 Stripping old blocks code; moving blocks -> blocks_common, project-wide lint (#580) 
* Remove unused Blockly blocks

* Remove unused text Blockly blocks; convert to JSON

* Move blocks/ -> blocks_common/

* Recompile for moved/removed blocks

* Remove spectools

* Project-wide lint

* Recompile August 30

* Pin package.json
 2016-08-30 15:50:59 -04:00
Rachel Fenichel
79013d14fb First pass at scratch-style category menu 2016-08-26 18:29:34 -07:00
Batalov Sergey
ab101ee3b7 TreeSeparator node did not know about horiz. layout. Fixed. 2016-08-25 16:10:44 +05:00
Batalov Sergey
d4440d5165 Fix reversed right/left in RTL 2016-08-25 16:10:31 +05:00
Rachel Fenichel
546504a88a Merge remote-tracking branch 'upstream/develop' into cleanup/mainWorkspaceMetrics 2016-08-22 15:09:47 -07:00
Neil Fraser
c41a4fa6e4 Fix ability to expand toolbox categories. 2016-08-21 14:29:07 -07:00
Rachel Fenichel
cc9396d739 Prefer functions in workspaceSvg to functions in blockly.js 2016-08-19 14:13:20 -07:00
Rodrigo Queiro
88eac2480b Convert string tag name to goog.dom.TagName (#515) 
in createDom calls only. This improves the type information of the
created objects.
 2016-08-19 03:55:45 -07:00
Rachel Fenichel
4b5d4d4c26 Merge branch 'feature/variable_management' of https://github.com/google/blockly into feature/variable_management 2016-08-12 15:52:48 -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
350e1ff2cc Merge remote-tracking branch 'upstream/develop' into feature/variable_management_merge_develop 2016-08-08 16:58:51 -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
picklesrus
d215314ffd Revert "Convert createDom calls to createUntypedDom" 2016-07-20 15:21:45 -07:00
Batalov Sergey
34530666fb Small fixes 2016-07-20 08:49:28 +05: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
Rachel Fenichel
f040929bd8 Merge remote-tracking branch 'upstream/develop' into feature/merge_develop 2016-07-15 13:07:07 -07:00
Rachel Fenichel
18be9d1de8 Merge branch 'feature/variable_management' of https://github.com/google/blockly into feature/variable_management 2016-07-13 14:36:35 -07:00
Rachel Fenichel
8e652db9fe Merge branch 'develop' of https://github.com/google/blockly into feature/pull_google/7_11 2016-07-11 15:53:14 -07:00