Commit Graph

1496 Commits

Author SHA1 Message Date
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
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
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 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
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
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 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
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
Neil Fraser ea1d0d7d3a Add labels to Block Factory. 2016-10-14 07:47:23 -07:00
Neil Fraser 8b7ce77f8e Rotate Block Factory colour picker 90deg for more room. 2016-10-14 07:29:41 -07:00
Neil Fraser 5e797c704c Fix orphaned and overlapping menus in Block Factory. 2016-10-14 07:16:31 -07:00
Neil Fraser 5fc9e04b5c Untangle modal buttons. 2016-10-14 06:57:21 -07:00
Neil Fraser 32d09de62f Make dropdown in Block Factory modal. 2016-10-14 05:39:10 -07:00
Neil Fraser c677a8efe4 Fix two incorrect URLs in Closure dialog. 2016-10-14 02:39:10 -07:00
Neil Fraser c60e91d60e Routine recompile. 2016-10-14 02:22:38 -07:00
Neil Fraser 6edec3e0cf Merge branch 'master' into develop 2016-10-14 02:20:33 -07:00
Neil Fraser 7550cb1e96 Fix loading of Block Factory in Firefox. 2016-10-14 02:20:25 -07:00
Neil Fraser 7255ec0eec Fix #693, this time correctly. 2016-10-14 02:00:43 -07:00
Neil Fraser 92e92cdeaf Fix race condition when loading. 2016-10-14 01:56:55 -07:00
Neil Fraser ff48285a86 Block factory cleanup. Fix one-based list option. 2016-10-13 20:18:44 -07:00
Niklas Laxström 4014c27448 Localisation updates from https://translatewiki.net. 2016-10-13 07:49:27 +02:00
Katelyn Mann e913cbd7c4 Merge branch 'develop' 2016-10-12 11:36:24 -07:00
Katelyn Mann b49b78de77 Merge branch 'master' into develop 2016-10-12 11:27:40 -07:00
picklesrus 7c2016284a Change label of block factory to blockly developer tools. Change the icon too. Also remove old, unneeded index.html file from workspacefactory directory. (#694) 2016-10-12 11:21:59 -07:00
picklesrus 88dba494b9 Commit 941bdcd187 swapped caseInsensitiveCompare with toLowerCase but forgot to swap the check so it reversed the (#693)
error case. Fixing.
2016-10-12 11:06:09 -07:00
Neil Fraser 941bdcd187 Remove a bunch of Closure from Block Factory. 2016-10-11 16:50:13 -07:00
Katelyn Mann b7768fcdf3 Merge branch 'develop' 2016-10-11 15:25:51 -07:00
Katelyn Mann 0708799760 Routine recompile 2016-10-11 14:59:12 -07:00
RoboErikG 35d1fa575e Merge pull request #679 from drigz/bugfix/677
Don't modify workspace.variableList in generators
2016-10-11 12:31:13 -07:00
Neil Fraser 5df55ddea0 Block(ly) Factory prompts should have defaults. Drop unused copy of colourpicker code. 2016-10-11 12:16:17 -07:00
picklesrus c102734ccb Replace Block Factory with Blockly Factory. Save Block Factory in blockfactory_old for safety. (#691)
Keep icon.png and blocks.js back into blockfactory rather than pointing to blockfactory_old.
2016-10-11 11:25:07 -07:00
picklesrus dad6e47f86 Fix null pointer bug from commit 7928fac3ce. In this context the options object is in "this", not workspace. (#692) 2016-10-11 11:03:03 -07:00
Rachel Fenichel acaf81185e Mouseover behaviour fixes (#684)
* fix broken tooltips

* use bindEvent to make mouseover and mouseout work in the flyout
2016-10-11 10:55:42 -07:00
Sean Lip e1ae3f4aa8 Add a special aria-label for 'copy to marked spot' button to indicate the cause of its being disabled. 2016-10-10 17:47:15 -07:00