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

559 commits

Author SHA1 Message Date
Tim Mickel
154d4e1851 Draw text fields entirely using CSS during edit 2016-04-05 18:36:02 -04:00
Tim Mickel
e413d47f4d Remove borderRect_, clean up, and fix RTL 2016-04-05 12:19:01 -04:00
Rodrigo Queiro
46ed2fa129 Merge pull request #155 from drigz/bugfix/field-active-area 
Increase active area on one-field-blocks #132
 2016-04-04 11:09:55 +02:00
Rodrigo Queiro
a6a39fb49b Use text cursor on whole of horizontal input field 
We do this by applying the style to the same element we apply the click
target to, ie the whole block if it only has one field.
 2016-04-04 11:07:20 +02:00
Tim Mickel
afaafc1e5b Fix passing of secondary and tertiary colours 2016-04-01 15:04:08 -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
1487a9e1d0 Merge pull request #302 from rachel-fenichel/cleanup/block_remove_rendered 
Move Blockly.Block rendered into Blockly.BlockSvg
 2016-03-31 14:17:32 -04:00
rachel-fenichel
806249309e Merge pull request #305 from rachel-fenichel/cleanup/is_connected 
Add isConnected() to connections.
 2016-03-31 14:17:12 -04:00
Rodrigo Queiro
4daf3cd16f Increase active area on one-field-blocks 
If a block only has one field, the mouseup event (which triggers editing
of editable fields) will be bound to the block instead of the field.

Fixes #132.
 2016-03-31 16:43:17 +02:00
Neil Fraser
39f7e6660e Add category UI event. Issue #306. 2016-03-31 02:04:23 -07:00
Neil Fraser
83925b2fe7 Merge branch 'master' into develop 2016-03-30 20:52:02 -07:00
rachel-fenichel
ae1a0aab8a add isConnected() to connections. 2016-03-30 15:10:59 -07:00
Tim Mickel
0169999d86 Merge pull request #144 from tmickel/feature/mouse-wheel 
Distinguish mouse wheel/zoom and implement scrolling
 2016-03-30 14:15:01 -04:00
Tim Mickel
6a341a2193 Semicolon and note about startDragMetrics 2016-03-30 14:14:02 -04:00
Neil Fraser
2b71aacac6 Fix error in closing text input if block is deleted. See PR #300 and Issue #303. 2016-03-29 21:41:20 -07:00
Neil Fraser
a52c3e9db4 Roll back PR #300 due to issue #303. 2016-03-29 20:56:15 -07:00
rachel-fenichel
7665066565 Move Blockly.Block rendered into Blockly.BlockSvg 2016-03-29 17:30:39 -07: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
rachel-fenichel
13498ebcf3 Clean up isConnectionAllowed 2016-03-29 12:25:46 -07:00
Tim Mickel
8bf0f97f63 Move scroll method to WorkspaceSvg 2016-03-29 14:23:34 -04:00
Tim Mickel
18960bcbf6 Refactor to remove duplicate scroll bounds logic 2016-03-29 13:12:20 -04:00
Tim Mickel
473cb0abce Scrol workspace on mouse wheel and pinch-zoom 
Distinguish pinch-zoom in Chrome using e.ctrlKey.

If a mouse wheel event is not a zoom event, scroll the workspace.

#51
 2016-03-29 13:12:20 -04:00
Neil Fraser
d73531da6b Routine recompile. 2016-03-29 09:04:25 -07:00
Neil Fraser
0709758a3a Merge branch 'master' into develop 2016-03-29 08:56:43 -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
Neil Fraser
5f1cb3b92c Add click UI event. 2016-03-29 08:10:44 -07:00
Ciaran Jessup
9d99fe5385 Clearing the workspace now works even if a field is being edited 
Previously if a workspace.clear() was executed whilst a field was being edited then the following errors would appear in the console and the blockly workspace would become unresponsive.

    Uncaught TypeError: Cannot read property 'removeChangeListener' of null(anonymous function) @       blockly_compressed.js:19071Blockly.WidgetDiv.hide @ blockly_compressed.js:20609Blockly.WidgetDiv.hideIfOwner @     blockly_compressed.js:20620Blockly.FieldTextInput.dispose @ blockly_compressed.js:18961Blockly.Input.dispose @     blockly_compressed.js:15786Blockly.Block.dispose @ blockly_compressed.js:17275Blockly.BlockSvg.dispose @     blockly_compressed.js:18327Blockly.Block.dispose @ blockly_compressed.js:17272Blockly.BlockSvg.dispose @     blockly_compressed.js:18327Blockly.Block.dispose @ blockly_compressed.js:17272Blockly.BlockSvg.dispose @     blockly_compressed.js:18327Blockly.Block.dispose @ blockly_compressed.js:17272Blockly.BlockSvg.dispose @     blockly_compressed.js:18327Blockly.Workspace.clear @ blockly_compressed.js:14510window.onmessage @ index.html:175
    blockly_compressed.js:19041

    Uncaught TypeError: Cannot read property 'scale' of nullBlockly.FieldTextInput.resizeEditor_ @     blockly_compressed.js:19041Blockly.Workspace.fireChangeListener @ blockly_compressed.js:14544Blockly.Events.fireNow_ @     blockly_compressed.js:18833
 

Explicitly hiding the popup div first avoids this problem.
 2016-03-29 12:10:48 +01:00
Neil Fraser
741491347b Add list of ids to create/delete events for robustness. 2016-03-28 18:10:54 -07:00
rachel-fenichel
b559e4e0c3 Don't let c-blocks connect in the middle of a stack 2016-03-28 17:22:31 -07:00
Neil Fraser
db7a787778 Add UI events. 2016-03-28 15:40:37 -07:00
Neil Fraser
92f224dd52 Merge pull request #297 from picklesrus/develop-perf-1 
Remove Blockly.removeAllRanges and replace it with calls to add/remove
 2016-03-28 12:17:11 -07:00
rachel-fenichel
9337dc694f Merge branch 'develop' into feature/complicated_ghosts 2016-03-28 11:24:00 -07:00
Katelyn Mann
b11bd4fb71 Remove Blockly.removeAllRanges and replace it with calls to add/remove 
css to mark text as unselectable instead.  I can't prove this is
significantly faster with numbers since the call to setup the time out
costs ~.1ms and the call when the timer fires is ~.05.  This happens on almost
every mouse event though.  Plus, it seems to remove a flicker of highlighting when
frames are skipped and keeps scrolling via the scrollbar from highlighting.
 2016-03-28 10:06:43 -07:00
Neil Fraser
e7fcc39e78 Remove redundant movable check from checkType. 2016-03-27 01:46:53 -07:00
Neil Fraser
b8d48ebabe Destroy attached shadow block when input is destroyed. 2016-03-26 19:37:12 -07:00
Neil Fraser
05fc1ad91b Add workspace.clearUndo 2016-03-25 19:03:18 -07:00
Neil Fraser
65a25ffb7e Don't offer to cleanup blocks in non-scrolling workspace. 2016-03-24 21:31:13 -07:00
Neil Fraser
4585e21d9f Allow checkmark customization. 
Issue 295.
 2016-03-24 17:18:21 -07:00
Neil Fraser
82fdb5805b Fix leaky group. Recompile. 2016-03-24 16:54:53 -07:00
Neil Fraser
e0ebce1b60 Fix undoing function argument changes. 2016-03-24 15:30:29 -07:00
rachel-fenichel
8401d91071 Fix bugs with first in stack, again 2016-03-22 17:12:00 -04:00
Neil Fraser
39fbd24659 Remove setProcedureParameters from API (use domToMutation instead). 2016-03-22 10:48:13 -07:00
rachel-fenichel
acae0e57ae C blocks consume other blocks. 2016-03-22 13:03:56 -04:00
rachel-fenichel
0178c4a259 revert bad logic 2016-03-22 13:03:47 -04:00
rachel-fenichel
4110635e18 Fix ghost block flashing 2016-03-21 17:13:49 -04:00
rachel-fenichel
1d5d89f9df Always disconnect the ghost. 2016-03-21 16:57:39 -04:00
rachel-fenichel
9758d50576 Merge branch 'develop' into feature/complicated_ghosts 2016-03-18 17:01:39 -07:00