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
835 Commits 110 Branches 106 Tags
ea71cec0c71bb0b75de95565488472470dba06ca
Commit Graph

835 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Neil Fraser
ea71cec0c7 Trivial blocks only inherit tooltip from parent if on external inputs. 
Recompile.
 2016-05-03 17:49:10 -07:00
Neil Fraser
16f927c3de Merge branch 'master' into develop 2016-05-03 17:45:01 -07:00
Niklas Laxström
a0ac634336 Localisation updates from https://translatewiki.net. 2016-05-02 07:21:38 +02:00
rachel-fenichel
17ef4c5364 Merge pull request #350 from rachel-fenichel/bugfix/broken_test 
Fix test
 2016-04-27 13:23:49 -07:00
Rachel Fenichel
497f86ebf2 Fix test 2016-04-27 13:23:14 -07:00
Neil Fraser
59e21e1f17 Merge branch 'develop' 2016-04-21 06:05:55 -07:00
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
0696b6028f Merge pull request #344 from google/revert-108-toolbox-id 
Revert "Add option to set id on toolbox"
 2016-04-21 05:57:53 -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
Neil Fraser
d6f7eb3a3c Merge pull request #335 from picklesrus/merge-conflict-click-bug 
Fix bad merge. Commit  36e0764e57 and e…
 2016-04-18 17:07:04 -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
6bdaab4958 Merge branch 'develop' 2016-04-18 03:15:25 -07:00
Neil Fraser
9f260501fe Remove duplicate getBlockById function. 2016-04-18 03:14:55 -07:00
Neil Fraser
0b3c4a28a4 Merge branch 'master' into develop 2016-04-18 03:13:17 -07:00
Niklas Laxström
17be7c0644 Localisation updates from https://translatewiki.net. 2016-04-18 07:01:29 +02:00
Neil Fraser
9204bb58be Merge branch 'develop' 2016-04-15 23:49:06 -07:00
Neil Fraser
83c04c474a Merge branch 'master' into develop 2016-04-15 23:46:06 -07:00
Neil Fraser
ec4ab87916 replace "變量" with "變數" to make translation correct for traditional Chinese #260 
Porting JS changes over to JSON.
 2016-04-15 23:36:45 -07:00
Neil Fraser
e162a6236a Merge branch 'pr/260' 
# Conflicts:
#	core/workspace_svg.js
 2016-04-15 23:23:06 -07:00
Neil Fraser
b3a4a355f4 Merge pull request #328 from lindt/master 
german translation: broken url, punctuation, grammar fixes
 2016-04-14 16:50:47 -07:00
Neil Fraser
5a6ef5a6e3 Merge pull request #235 from pjkui/patch-2 
fixed an translation error
 2016-04-14 16:50:23 -07:00
Neil Fraser
49fff433e3 Merge pull request #234 from pjkui/patch-1 
fixed a translation error
 2016-04-14 16:50:16 -07:00
Neil Fraser
bd779ad938 Respect generator.INDENT setting. Issue #331. 2016-04-14 01:14:37 -07:00
Neil Fraser
8c3de3a581 Routine recompile. 2016-04-14 00:29:13 -07:00
Neil Fraser
e568d5d094 Merge branch 'master' into develop 2016-04-14 00:25:49 -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
Niklas Laxström
95828cbd65 Localisation updates from https://translatewiki.net. 2016-04-14 07:56:05 +02: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
Neil Fraser
c21d4bab79 Merge branch 'master' into develop 2016-04-11 17:26:24 -07:00
Neil Fraser
1a9d66e3d4 Google open source policy compliance. 2016-04-11 17:25:48 -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
Niklas Laxström
dfa9b44a7f Localisation updates from https://translatewiki.net. 2016-04-11 07:04:06 +02:00