CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-06-17 16:45:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
835 Commits 115 Branches 120 Tags
ea71cec0c71bb0b75de95565488472470dba06ca
Commit Graph

477 Commits

Author SHA1 Message Date
Neil Fraser 6c0bf9f966 Routine recompile. 2016-04-21 06:05:25 -07:00
Neil Fraser 15913769b4 Merge branch 'master' into develop 2016-04-21 06:01:04 -07:00
Neil Fraser 418a7e621d Revert "Add option to set id on toolbox" 2016-04-21 05:57:26 -07:00
Neil Fraser b6aa4f02c3 Merge branch 'master' into develop 2016-04-21 05:55:19 -07:00
Neil Fraser 1d199ae267 Merge pull request #108 from cdjackson/toolbox-id 
Add option to set id on toolbox
 2016-04-21 05:54:32 -07:00
Neil Fraser 9e034b2716 Merge pull request #332 from picklesrus/develop-hatblock 
Take into account height of the hat for hat blocks.
 2016-04-21 05:27:35 -07:00
Neil Fraser e65d6964bd Merge pull request #342 from rachel-fenichel/cleanup/flyout_listeners 
Decompose functions in flyout.  Does not change behaviour.
 2016-04-21 05:19:00 -07:00
Neil Fraser f5988e9109 Merge pull request #341 from rachel-fenichel/cleanup/scrollbar 
Constrain scrollbar value in set() and decompose resize() into horizo…
 2016-04-21 05:10:37 -07:00
Neil Fraser fd7d4a2bef Make scrollCenter public, remove zoomReset. 2016-04-21 04:52:43 -07:00
Neil Fraser 3df4173039 Fix infinity in hidden scrollbars. Issue #340. 2016-04-20 17:45:40 -07:00
Neil Fraser 703ac981da Routine recompile. 2016-04-20 16:44:13 -07:00
rachel-fenichel c8f98a7ded Decompose functions in flyout. Does not change behaviour. 2016-04-20 14:14:53 -07:00
rachel-fenichel 4bc24fe3e1 Constrain scrollbar value in set() and decompose resize() into horizontal and vertical modes. 2016-04-20 11:26:01 -07:00
Neil Fraser 52eb6adcc2 Add click events to non-closing flyout blocks. Issue #337. 2016-04-20 05:03:05 -07:00
Neil Fraser c785cabe40 Use more coordinates. 2016-04-19 23:24:42 -07:00
Neil Fraser 7e96a60da7 Use goog.math.Coordinate instead of separate X and Y properties. 2016-04-19 21:14:49 -07:00
Neil Fraser 6d58f7959f Don't fire click when editing a field. Issue #336 part 1. 2016-04-19 21:14:49 -07:00
Katelyn Mann b69ab459bd Fix bad merge. Commit 36e0764e57 and e39a0b7069 collided on their use/removal of the event param to one of the zoom functions. 2016-04-18 16:53:32 -07:00
Neil Fraser 9f260501fe Remove duplicate getBlockById function. 2016-04-18 03:14:55 -07:00
Neil Fraser bd779ad938 Respect generator.INDENT setting. Issue #331. 2016-04-14 01:14:37 -07:00
Neil Fraser e08f0aa05b Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	core/workspace_svg.js
 2016-04-14 00:25:25 -07:00
Neil Fraser 36e0764e57 Fix zoomToFit if there are no scrollbars. Issue #325. 2016-04-14 00:23:17 -07:00
Neil Fraser b5a2f75cee Add tooltips to input holes in flyout. 2016-04-13 15:54:05 -07:00
Katelyn Mann 79f91266ac Take into account height of the hat for hat blocks. 
Also, position hat blocks correctly in the flyout/toolbox.
This fixes #330.
 2016-04-12 14:59:58 -07:00
Neil Fraser 701d828090 Merge pull request #329 from picklesrus/doubleclick 
Add event preventDefault() calls to the end of zoom button handlers s…
 2016-04-11 17:47:56 -07:00
Katelyn Mann e39a0b7069 Add event preventDefault() calls to the end of zoom button handlers so the 
browser doesn't try to handle them itself.  This keeps it from selecting text
on double clicks.
 2016-04-11 15:33:05 -07:00
Neil Fraser d269f70f95 Don't fire 'click' events when opening bubbles. Fix groups on context menu deletes. 2016-04-07 17:07:02 -07:00
Neil Fraser c3931df2ae Fix shadow block init on headless workspaces. 2016-04-07 16:24:27 -07:00
Neil Fraser 1af4edd861 Prevent events on different workspaces from merging. 2016-04-07 14:39:39 -07:00
Neil Fraser 5e0c04dccd Merge branch 'master' into develop 2016-04-07 14:36:57 -07:00
rachel-fenichel 576830c309 Blockly.parseToolboxTree_ -> Blockly.Options.parseToolboxTree 2016-04-07 13:38:36 -07:00
Neil Fraser 194341f2e5 Allow use of setOutput (and friends) to change checks. Issue #315. 2016-04-06 16:27:25 -07:00
Neil Fraser effa81f622 Create fromJson for events. Add master-slave demo. 2016-04-06 14:27:15 -07:00
Neil Fraser 61b3fbfe11 Move block database to workspace. 2016-04-05 18:43:39 -07:00
Neil Fraser 4e42a1b78e Swap order of arguments on domToWorkspace. 2016-04-04 18:31:41 -07:00
Neil Fraser 4ac1204550 Set field.sourceBlock in headless Blockly. 2016-04-04 17:47:15 -07:00
Neil Fraser d69209a7db Merge branch 'master' into develop 2016-04-04 14:54:07 -07:00
Neil Fraser 7705d2226e Merge pull request #314 from miguel76/fix-313 
Fix #313
 2016-04-04 14:50:37 -07:00
miguel76 f7e455e856 Fix #313 2016-04-04 18:09:18 -03:00
rachel-fenichel a26fe6acf8 Disable connecting to last block in stack 2016-04-04 11:10:05 -07:00
Neil Fraser 960b07daab Fix grouping of disconnect and delete. 2016-04-03 15:45:19 -07:00
Neil Fraser 2ce0a25f92 Fix error thrown when disconnecting blocks that have never been dragged. 2016-04-02 04:53:04 -07: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
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
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