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

2166 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rachel Fenichel
a3839b52ad Merge branch 'develop' of https://github.com/google/blockly into feature/merge_nov_1 2016-11-01 18:02:37 -07: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
Andrew n marshall
52ffc64f6a Refactor variable rename to handle UI actions more directly. (#726) 
FieldDropdown now has onItemSelected(..) method to handle the menu item selection action. Variable renames and deletes are now handled here, instead of during validation.

Also fixes an issue deleting variables used by less than two blocks.

Fixes #723.
 2016-11-01 16:32:10 -07:00
Rachel Fenichel
dfbf787655 Merge pull request #725 from rachel-fenichel/feature/flyout_label 
Add option to style flyout buttons as labels
 2016-10-31 16:40:26 -07:00
Rachel Fenichel
afca4264ca Add option to style flyout buttons as labels 2016-10-31 15:20:16 -07:00
Rachel Fenichel
fae3ccfe88 Merge pull request #724 from rachel-fenichel/feature/button_callbacks 
Allow creation of buttons with developer-designated callbacks
 2016-10-31 14:39:35 -07:00
Rachel Fenichel
4d02e9bee6 lint 2016-10-31 14:38:55 -07:00
Rachel Fenichel
703bd96f7e Allow creation of buttons with developer-designated callbacks 2016-10-31 14:24:00 -07:00
Neil Fraser
ddf3b72a7f Prevent custom indents from getting into an infinite loop. 2016-10-31 11:32:04 -07:00
Rachel Fenichel
ba955ca2e1 Merge pull request #719 from rachel-fenichel/bugfix/multitouch_flyout_scroll 
Fix multitouch bug on flyout drag: don't reset flyout drag mode befor…
 2016-10-31 11:01:49 -07:00
Andrew n marshall
72ff6d9ead Adding controls_ifelse block (#722) 
Adding controls_ifelse, an if/else block that is loaded from JSON and does not use mutators. This gives "else" capability to Android & iOS implementations, which don't support JavaScript mutators.

Added this block to the playground simple toolbox and all generators.
 2016-10-31 11:00:39 -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
Andrew n marshall
0156f2e103 Addressing comments from #703 2016-10-28 16:04:57 -07:00
Rachel Fenichel
0c015fd439 Merge pull request #710 from rachel-fenichel/feature/save_load_optimization 
Disable resizing the workspace during clearing and loading from xml, …
 2016-10-28 15:01:05 -07:00
Neil Fraser
9e5273bfc7 Update JS Interpreter to latest. 2016-10-26 20:42:21 -07:00
Neil Fraser
726f3533f5 Routine recompile. 2016-10-26 18:43:29 -07:00
Neil Fraser
144be4d49f Block highlighting 
* Separate block selection (editing) from highlighting (execution).
* Remove add/removeDragging functions. They clutter the API for no reason.
 2016-10-26 18:39:56 -07:00
Rachel Fenichel
3876eda49e Merge pull request #711 from rachel-fenichel/feature/toolbox_cleanup 
Toolbox code cleanup.
 2016-10-26 11:25:40 -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
c91d1c5c27 Merge pull request #705 from rachel-fenichel/bugfix/flyout_start_scroll 
Scroll to start when opening new category
 2016-10-24 11:29:14 -07:00
Neil Fraser
6300faf85e Set main workspace when scrollbar clicked. Issue #704 2016-10-23 20:31:59 -07:00
Neil Fraser
12e6a7a535 Also listen to right-button in menus. #456 2016-10-23 07:31:15 -07:00
Neil Fraser
4d65b606bd Set current workspace when clicking zoom controls. Issue #440 2016-10-23 06:38:04 -07:00
Neil Fraser
4f08f2536f Replace category colour pallet with correctly calculated colours. 2016-10-23 01:05:13 -07:00
Rachel Fenichel
c3f9b901a8 Merge pull request #707 from rachel-fenichel/bugfix/annotations_cleanup 
fix some annotations
 2016-10-21 17:39:29 -07:00
rachel-fenichel
ed9453cfb5 fix some annotations 2016-10-21 17:38:57 -07:00
Rachel Fenichel
14a07ef2f7 Merge pull request #711 from rachel-fenichel/bugfix/string_types 
Fix annotation
 2016-10-21 17:37:21 -07:00
rachel-fenichel
3d53b1e7fb Fix annotation 2016-10-21 17:34:59 -07:00
Rachel Fenichel
e2e2a3e298 Disable resizing the workspace during clearing and loading from xml, as an optimization 2016-10-21 14:30:30 -07:00
Rachel Fenichel
7cd796a072 Scroll to start when opening new category 2016-10-21 13:03:48 -07:00
Rachel Fenichel
2243cd9e9a Merge pull request #701 from rachel-fenichel/feature/input_shape_optimization 
Input shape optimization
 2016-10-21 12:34:30 -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
Tim Mickel
d1a9b6d31a Remove workspace resize from FieldTextInput onchange (#689) 2016-10-20 22:25:32 -04:00
Andrew n marshall
81499e4392 Merge pull request #703 from AnmAtAnm/alert-confirm-prompt 
Adding hooks to support custom alert, confirm, and prompt dialogs
 2016-10-20 17:20:00 -07:00
Andrew n marshall
acb5569d39 Adding a demo for custom dialogs. 2016-10-20 16:30:55 -07:00
Andrew n marshall
8f3b4bcb5e Replaces calls to window.alert(), window.confirm(), and window.prompt() with Blockly.alert(), Blockly.confirm(), and Blockly.prompt(). These are designed to allow app developers to replace the dialogs with versions that match their own open app, possibly avoiding modal browser dialogs. They each take a callback, so the developer has the opportunity to implement non-modal behavior. 2016-10-20 16:30:40 -07:00
Rachel Fenichel
2a83896303 Input shape optimization 2016-10-20 15:46:50 -07:00
Rachel Fenichel
b56b29a3bd Merge pull request #697 from rachel-fenichel/bugfix/widget_touch 
Clear touch identifier after num pad touch
 2016-10-20 10:46:23 -07:00
Neil Fraser
c2bf01ab48 Dragging blocks towards the toolbox should create blocks rather than do nothing. 2016-10-19 17:15:57 -07:00
Neil Fraser
122f69f92c Disable break/return blocks in addition to warning. 2016-10-19 17:04:07 -07:00
Rachel Fenichel
915907da16 clear touch identifier after num pad touch. 2016-10-19 13:40:45 -07:00
Rachel Fenichel
3bcea6b6fe cleanup and documentation 2016-10-19 13:25:21 -07: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
Neil Fraser
9fe29a9cc2 Block Factory: Add missing workspace options, fix reset button. 2016-10-17 17:32:14 -07:00
Rachel Fenichel
8d4401430c Merge pull request #690 from twodee/upstream 
Stops duplicating on rename of old ID to old ID.
 2016-10-17 16:30:51 -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
2a16e1fa32 Address build.py error & closure warnings (#688) 
* Restore en.json to fix #685

* Address closure compiler warnings
 2016-10-17 14:50:32 -04:00
Neil Fraser
728284ab61 Disable options in readonly mode. (Block Factory) 2016-10-14 08:57:39 -07:00
Neil Fraser
a2e7481d04 Stop block exporter options from jumping around. 2016-10-14 08:29:48 -07:00