scratchfoundation/scratch-blocks
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-blocks.git synced 2025-07-27 22:29:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions1
6171 commits 79 branches 374 tags 112 MiB
Commit graph

118 commits

Author SHA1 Message Date
Tim Mickel
c9515597e1 Move dragSurface.createDom up to inject.js 2016-04-07 23:00:33 -04:00
rachel-fenichel
18a1550285 Horizontal toolbox layout with positioning at start or end. 2016-04-07 14:02:22 -07:00
Neil Fraser
4ac1204550 Set field.sourceBlock in headless Blockly. 2016-04-04 17:47:15 -07:00
Tim Mickel
c4e22097ff Fix Blockly.createMainWorkspace_ docstring 2016-04-02 16:26:40 -04:00
Tim Mickel
e8c0346378 Fix positioning of drag surface using relative container 2016-04-01 17:32:01 -04:00
Tim Mickel
cbc38698d2 Add injection of the dragSurface 2016-04-01 16:32:56 -04:00
Tim Mickel
3cbe49e37a Merge branch 'develop' of https://github.com/google/blockly into google-master-april-1 
# Conflicts:
#	blockly_compressed_horizontal.js
#	core/block.js
#	core/block_render_svg_vertical.js
#	core/connection.js
#	core/inject.js
 2016-04-01 15:00:44 -04:00
Tim Mickel
a65109f423 Merge remote-tracking branch 'Google/master' into google-master-april-1 
# Conflicts:
#	blockly_compressed_horizontal.js
#	blockly_uncompressed_vertical.js
#	blocks_compressed.js
#	core/block.js
#	core/block_svg.js
#	core/blockly.js
#	core/connection.js
#	core/field_textinput.js
#	core/workspace_svg.js
#	generators/lua/lists.js
#	generators/lua/text.js
#	msg/js/he.js
#	msg/js/id.js
#	msg/js/sr.js
#	msg/js/zh-hant.js
#	msg/json/en.json
 2016-04-01 14:44:46 -04:00
rachel-fenichel
be3c761fc0 lint 2016-03-29 15:22:45 -07:00
rachel-fenichel
e2f1a6c843 Fix annotations 2016-03-29 14:26:56 -07:00
rachel-fenichel
0686762a12 Move options to their own file; clean up initialization code. 2016-03-29 14:15:29 -07:00
Neil Fraser
ac0b5e7871 Use ENUM for dragMode. Blocks no longer sticky when created from disappearing flyout. 2016-03-29 08:36:11 -07:00
Tim Mickel
f2fb5d5aa4 Add SVG filter for glowing stack 2016-03-04 12:22:14 -05:00
Tim Mickel
5bdc3070b9 Merge branch 'upstream' into feature/upstream-merge 
# Conflicts:
#	blockly_compressed_vertical.js
#	blockly_uncompressed_vertical.js
#	core/connection.js
#	tests/jsunit/index.html
#	tests/playground.html
 2016-03-03 11:55:59 -05:00
Neil Fraser
5097963cb1 Reduce code duplication in 'if' block. 2016-03-01 18:21:02 -08:00
Neil Fraser
fee94ae405 Allow injection based on CSS selector (based on PR 249). 2016-02-29 15:11:00 -08:00
Neil Fraser
e6db687234 Fix startScale on workspaces without a fixed flyout. 2016-02-24 19:27:03 -08:00
Tim Mickel
fd9f6a6d00 Remove Blockly sound playing and replace with a callback 2016-02-24 15:50:36 -05:00
Rachel Fenichel
4230dd2b83 Fix checking deletion rectangles and fix toolbox config. 2016-02-19 16:23:32 -08:00
Rachel Fenichel
c0e28dcb15 switch to an enum 2016-02-17 16:32:31 -08:00
Rachel Fenichel
7cd8135125 Render toolbox and flyout at start/end in vertical mode. 2016-02-12 14:48:13 -08:00
Rachel Fenichel
3462a5a2c1 position toolbox 2016-02-12 10:57:33 -08:00
Rachel Fenichel
803d0e72b2 Turn toolbox sideways in the horizontal playground. 2016-02-11 14:46:51 -08:00
Neil Fraser
dc1f03a168 Merge pull request from carlosperate/toolbox_nodes 
Allow XML DOM nodes to be injected as toolbox in IE
 2016-01-08 15:13:47 -08:00
Neil Fraser
4253de041a Remove old realtime. 2016-01-08 13:03:22 -08:00
Neil Fraser
3bce368115 Simplify workspace options by removing svg property. 2016-01-07 17:01:01 -08:00
carlosperate
bda78da155 Allow nodes input to toolbox injection in IE 2016-01-05 00:56:57 +00:00
Neil Fraser
00ba0acf40 Clean up build file from previous PR. 2015-11-13 21:11:24 -08:00
Neil Fraser
a485e63df2 Allow zooming of non-scrolling workspaces. 2015-10-21 14:38:39 -07:00
Neil Fraser
dcd463b550 Add 'startScale' and remove 'enabled' options on zoom. 2015-10-21 13:25:02 -07:00
Neil Fraser
8ecfab014f Separate overlapping emboss filter and disabled pattern across multiple Blockly instances. Issue 184. 2015-09-28 12:20:28 -07:00
Neil Fraser
37777828f4 Fix disconnect sound in FF. 2015-09-22 11:14:25 -07:00
Neil Fraser
c14951c928 Add disconnect sound and animation. 2015-09-20 14:28:39 -07:00
Neil Fraser
5b7fec7092 Add zooming feature. 
By carloslfu.
 2015-08-19 17:21:05 -07:00
Neil Fraser
09f5ac6f7b Remove non-functioning workspace long-click. 2015-07-13 17:48:50 -07:00
Neil Fraser
e0f90e6e33 Adding more type documentation. 2015-07-13 15:03:22 -07:00
Neil Fraser
d819db2acf Lint corrections. 2015-07-02 19:41:10 -07:00
Neil Fraser
edd3e3bf33 Lint corrections. 2015-06-17 13:05:24 -07:00
Neil Fraser
c5b88b1116 Kill SVG when disposing main workspace. 2015-05-02 21:08:18 -07:00
Neil Fraser
d83f5872c6 Don't allow snapping to grid with 0 spacing. 2015-04-30 17:59:56 -07:00
Neil Fraser
3ff69d47fe Inject can now take an ID. Also, fix unit tests. 2015-04-29 20:26:04 -07:00
Neil Fraser
ede636361d Simplify workspace resizing. 2015-04-28 17:55:45 -07:00
Neil Fraser
c014799df8 Fix black workspace background in IE11. 2015-04-28 15:06:22 -07:00
Neil Fraser
17961f7f58 Support multiple Blockly instances. 2015-04-28 13:51:25 -07:00
Neil Fraser
6d1df4dfb5 Revert "De-singleton Blockly. Part 1." 
This reverts commit 3122c8a93f.
 2015-04-07 21:01:37 -07:00
Neil Fraser
3122c8a93f De-singleton Blockly. Part 1. 2015-04-06 18:36:53 -07:00
Neil Fraser
3e12c1ea5e Render sprites from vectors. Remove blurry shadow from trash. 2015-03-23 23:55:13 -07:00
Neil Fraser
da122e2a31 Enable long-press context menus. 2015-03-17 15:37:33 -07:00
Neil Fraser
4d2aac4f19 Bug-fixes to background grid. 2015-03-08 17:39:30 -07:00
Neil Fraser
612b190ef4 Add background grid for snapping. 2015-03-08 12:48:42 -07:00