CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-10 02:17:09 +01:00
Code Issues Packages Projects Releases Wiki Activity
732 Commits 110 Branches 106 Tags
fe3c92409e49ca19eef002ae9e69eae855eaa21d
Commit Graph

732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Neil Fraser
fe3c92409e Merge branch 'develop' 2016-03-29 09:05:46 -07: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
e03b899cb1 Merge pull request #300 from ciaranj/ciaranj-patch-1 
Clearing the workspace now works even if a field is being edited
 2016-03-29 08:56:16 -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
Neil Fraser
e4f2bdcd47 Merge branch 'develop' 2016-03-28 15:41:47 -07:00
Neil Fraser
f549744bf0 Recompile. 2016-03-28 15:41:05 -07:00
Neil Fraser
db7a787778 Add UI events. 2016-03-28 15:40:37 -07:00
Neil Fraser
b4218217c2 Merge branch 'master' into develop 2016-03-28 12:53:11 -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
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
Niklas Laxström
aef7720fc1 Localisation updates from https://translatewiki.net. 2016-03-28 10:06:29 +02:00
Neil Fraser
a4bba21bd7 Merge branch 'develop' 2016-03-27 02:21:14 -07:00
Neil Fraser
c1872750ae Fix recursive undo/redo loop in logic_compare and logic_ternary blocks. 2016-03-27 02:20:30 -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
64dadc2482 Merge branch 'develop' 2016-03-25 19:04:23 -07:00
Neil Fraser
0626724277 Merge branch 'master' into develop 2016-03-25 19:03:37 -07:00
Neil Fraser
05fc1ad91b Add workspace.clearUndo 2016-03-25 19:03:18 -07:00
Neil Fraser
db980dbf94 Merge branch 'develop' 2016-03-24 21:32:02 -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
ad37d69af9 Merge branch 'master' into develop 2016-03-24 16:57:11 -07:00
Neil Fraser
a2176e43d9 Merge pull request #298 from google/develop 
Undo/Redo
 2016-03-24 16:56:58 -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
Neil Fraser
39fbd24659 Remove setProcedureParameters from API (use domToMutation instead). 2016-03-22 10:48:13 -07:00
Neil Fraser
d086634394 Lint and recompile. 2016-03-18 15:19:26 -07:00
rachel-fenichel
cd3b563e54 Merge pull request #292 from rachel-fenichel/cleanup/constants 
Move constants to their own file
 2016-03-18 14:36:17 -07:00
rachel-fenichel
b37efe829e Move constants to their own file 2016-03-18 14:35:18 -07:00
Neil Fraser
a7892d1aee Raise error if statement block returns tuple. 2016-03-18 14:17:31 -07:00
Neil Fraser
6ae436a153 Add undo/redo context menu options on workspace. 2016-03-17 14:44:26 -07:00
Neil Fraser
a7d181a58a Merge branch 'master' into develop 2016-03-17 13:38:13 -07:00
Niklas Laxström
702dbc36b9 Localisation updates from https://translatewiki.net. 2016-03-17 08:44:28 +01:00
Neil Fraser
0b5338b707 Simplify function statement toggle reconnection. 2016-03-16 23:11:55 -07:00
Neil Fraser
a3b850b0d3 Merge pull request #287 from rachel-fenichel/feature/source_block_fn 
Add a getter; stop accessing private field sourceBlock_ from outside …
 2016-03-16 19:45:20 -07:00
Neil Fraser
2b96d7a756 Don't select blocks if readOnly is changed. 2016-03-16 19:10:36 -07:00
Neil Fraser
3bf04aedc6 Add toJson to events. 2016-03-16 17:55:44 -07:00
rachel-fenichel
2c70f7ec26 Add a getter; stop accessing private field sourceBlock_ from outside of a connection. 2016-03-15 16:03:49 -07:00
Neil Fraser
95fbc0bb49 Fix checkbox events. Fix block deletion while mutator is open. 2016-03-14 23:14:58 -07:00
Neil Fraser
72bb08a4ec Add undo/redo. 
Some bugs in undoing function argument changes.
 2016-03-14 23:14:05 -07:00
Neil Fraser
8fb1178ed8 Update message descriptions. 2016-03-14 16:00:25 -07:00
Neil Fraser
02924bc34c Merge branch 'master' into develop 2016-03-14 15:53:39 -07:00
Neil Fraser
be2626551f Merge pull request #285 from drigz/reswords 
Add missing comma to Lua reserved words
 2016-03-14 15:53:25 -07:00
rachel-fenichel
7b77527d57 Merge pull request #284 from rachel-fenichel/feature/last_in_stack 
consider the last block on the stack when looking for places to attac…
 2016-03-14 13:29:11 -07:00
rachel-fenichel
7f1081fe41 Merge pull request #283 from rachel-fenichel/feature/connect_no_next 
Don't connect a block with no next connection if that would force a b…
 2016-03-14 13:10:39 -07:00
Rodrigo Queiro
37d3ecc304 Fix JSDoc syntax on Blockly.Lua.lists.getIndex_ 
Also fix a return type warning in one of the branches.
 2016-03-14 15:08:49 +01:00