CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-09 18:10:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,468 Commits 110 Branches 106 Tags
2aadfa6ac2835d237656c540ab54cd97641842b6
Commit Graph

2468 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew n marshall
2aadfa6ac2 BlockFactory: Fixing incorrect <button> html (#1622) 
Applies changes suggested in #1176, based off of develop.
 2018-02-20 13:00:44 -08:00
Andrew n marshall
f45c6faf05 Fix #1619. buildTooltipWithFieldValue() => buildTooltipWithFieldText() (#1638) 
Fix #1619. buildTooltipWithFieldValue() => buildTooltipWithFieldText()

The "value" of FieldVariables was the variable id.
However, we usually want the field text for the human visible tooltip.
Refactoring and renaming buildTooltipWithFieldValue to use the field
text.
 2018-02-16 16:51:18 -08:00
Andrew n marshall
4092a644d5 Adding a iframe wrapper around the playground. (#1634) 2018-02-16 16:48:11 -08:00
Andrew n marshall
d9a7f84b98 Adding test blocks into the playground (#1629) 
The new toolbox option includes a number of test blocks
largely pulled from the android project, testing various
configurations and edge cases.
 2018-02-16 11:14:40 -08:00
Rachel Fenichel
29dc4021f0 Merge pull request #1631 from rachel-fenichel/bugfix/1544 
Delete extra variables at the end of a procedure argument edit
 2018-02-16 11:11:42 -08:00
Rachel Fenichel
af59e27d96 Cleanup 2018-02-16 11:02:03 -08:00
Rachel Fenichel
f3a4664dea Delete extra variables at the end of a procedure argument edit 2018-02-15 17:18:23 -08:00
Rachel Fenichel
4c63eef022 Merge pull request #1620 from AnmAtAnm/closure-version 
Updating Closure version
 2018-02-14 16:51:25 -08:00
Andrew n marshall
446c1bbce4 Updateing Closure to 20180204.0.0 2018-02-14 16:15:43 -08:00
Rachel Fenichel
19969117ef Merge pull request #1617 from google/VariableXML 
Reduce size of XML by omitting empty variable tag.
 2018-02-14 14:13:41 -08:00
Neil Fraser
73417b8317 Reduce size of XML by omitting empty variable tag. 2018-02-14 11:22:55 -08:00
RoboErikG
551b05b4f1 Fix typo in BKY message key (#1616) 
We had {% instead of %{

Fixes #1613
 2018-02-14 10:52:49 -08:00
Mark Gibson
54f0e06e21 Customising field types using a register of fields #1584 (#1594) 
Implement #1584 - Fields now registered by their JSON type name, allowing new custom fields and overriding of the standard fields. Replaces the manual switch statement for loading fields from JSON block definitions.
 2018-02-14 10:14:59 -08:00
Rachel Fenichel
acaeeb4d2e Merge pull request #1610 from AnmAtAnm/rm-dropdown-init-forceRerender 
Remove forceRerender() from FieldDropDown.init()
 2018-02-13 17:14:58 -08:00
Andrew n marshall
e1e3f273d2 Remove forceRerender() from FieldDropDown. 
Errantly forced whole block to rerender, including fields that
had not yet been initialized.

Fixes #1609
 2018-02-13 15:01:33 -08:00
Rachel Fenichel
962c38b718 Merge pull request #1607 from rachel-fenichel/bugfix/1604 
Break circular dependency
 2018-02-13 13:00:03 -08:00
Rachel Fenichel
6aa06e9b48 Merge pull request #1605 from rachel-fenichel/bugfix/1600 
Bugfix/1600
 2018-02-13 10:46:38 -08:00
Rachel Fenichel
5e0928e4f3 Break circular dependency 2018-02-13 10:44:07 -08:00
Rachel Fenichel
2bd606c5e7 Fix comments 2018-02-13 10:41:57 -08:00
Rachel Fenichel
3a8fc92143 Indentation 2018-02-12 17:14:26 -08:00
Rachel Fenichel
744e70e4d2 Split playground toolbox XML into typed and untyped examples. 2018-02-12 17:12:52 -08:00
Rachel Fenichel
3463799d83 Merge pull request #1599 from rachel-fenichel/bugfix/sb-1373 
Don't allow block deletion in the flyout.  Make copy-paste always copy to the main workspace
 2018-02-12 14:43:40 -08:00
Andrew n marshall
dc7783ee01 Warn conflicts with Blockly.Generator.prototype (#1603) 
Console warning if block prototypeName conflicts with Blockly.Generator.prototype.
 2018-02-12 13:44:54 -08:00
Rachel Fenichel
f471a23b2b Add comment 2018-02-12 13:25:07 -08:00
Andrew n marshall
03538c19a7 Fix #1601 
Correct deprecated argument order in domToWorksapce call in WorkspaceFactory.
 2018-02-12 12:52:34 -08:00
Rachel Fenichel
4a4a0fe569 Merge pull request #1596 from rachel-fenichel/master_to_develop 
Master to develop
 2018-02-09 10:55:46 -08:00
Rachel Fenichel
57852f0249 Don't allow block deletion in the flyout. Make copy-paste always copy to the main workspace. 2018-02-08 17:23:22 -08:00
Rachel Fenichel
90b0f34c08 Merge pull request #1597 from rachel-fenichel/bugfix/1554 
Make WorkspaceSvg.refreshToolboxSelection_ package instead of private
 2018-02-08 16:51:40 -08:00
Rachel Fenichel
6a018515af Make WorkspaceSvg.refreshToolboxSelection_ package instead of private 2018-02-08 16:45:19 -08:00
Rachel Fenichel
3635657029 Rebuild 2018-02-08 16:05:09 -08:00
Rachel Fenichel
f2641d36aa Merge branch 'master' of https://github.com/google/blockly into master_to_develop 2018-02-08 15:48:24 -08:00
Andrew n marshall
cf1c69686d In Code demo, give warning if a generator function is missing. (#1585) 
Refactored renderContent() to use new attemptCodeGeneration()
function, reducing code duplication.
attemptCodeGeneration() now calls checkAllGeneratorFunctionsDefined()
before running the generator.
 2018-02-08 13:01:33 -08:00
translatewiki.net
99f977e5c9 Localisation updates from https://translatewiki.net. 2018-02-08 09:52:28 +01:00
Rachel Fenichel
e58c8a32d4 Merge pull request #1590 from rachel-fenichel/feature/bubble_dragger 
Create a Dragger for moving bubbles around
 2018-02-07 14:19:23 -08:00
Rachel Fenichel
85cb2b8c41 Merge pull request #1592 from jollytoad/feature-1486-fields-fromJson 
Fields should implement fromJson #1486
 2018-02-07 11:22:15 -08:00
Mark Gibson
28d3d68b62 Fix fromJson_ to fromJson in tests 2018-02-07 18:30:22 +00:00
Mark Gibson
2308ae8c22 Remove underscore from fromJson_ 2018-02-07 18:18:35 +00:00
Mark Gibson
6ab7cd25f5 Missing semi-colon! 2018-02-07 12:44:01 +00:00
Mark Gibson
d40ef474ae See issue #1486 - adds fromJson_ fn to every Blockly.Field, removing Block.newField*FromJson_ helpers 2018-02-07 12:22:26 +00:00
Rachel Fenichel
4ddba5aadb rebuild 2018-02-06 19:00:32 -08:00
Rachel Fenichel
9d2cb829a9 Move code into the bubble dragger where possible 2018-02-06 18:56:26 -08:00
Rachel Fenichel
7acd4133aa Remove unused code in the bubble dragger. 2018-02-06 18:07:21 -08:00
RoboErikG
531c459147 Update the comment on eslint quotes checks (#1589) 
We turn quotes checking off in eslint because the JSON blobs in Blockly's files must use double quotes. Everywhere else we prefer single quotes. This updates the comment to make that clearer.
 2018-02-06 13:22:00 -08:00
Rachel Fenichel
68914be67d Wire up bubble dragging, with coordinate problems 2018-02-05 16:57:44 -08:00
translatewiki.net
66baae1312 Localisation updates from https://translatewiki.net. 2018-02-01 09:45:17 +01:00
Andrew n marshall
f497c70be0 Ran ./build.py 2018-01-31 14:29:09 -08:00
Rachel Fenichel
6d96e4003b Merge pull request #1576 from rachel-fenichel/bugfix/1574 
Add generators for dynamic variable blocks.
 2018-01-29 16:20:28 -08:00
Rachel Fenichel
c744664ad5 Merge pull request #1575 from rachel-fenichel/bugfix/1538 
Fix #1538
 2018-01-29 16:17:30 -08:00
Rachel Fenichel
4a059b23f8 Add tests 2018-01-29 16:04:47 -08:00
Rachel Fenichel
4c130aab83 Rename createVarBlock to createMockVarBlock, and pass in the workspace as a parameter 2018-01-29 15:15:32 -08:00