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

1786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew n marshall
c0677100fd Merge pull request #954 from AnmAtAnm/warn-on-overwrite 
Adding warning on duplicate JSON block definition.
 2017-02-24 15:51:20 -08:00
Andrew n marshall
1bc74819aa period 2017-02-24 15:47:35 -08:00
Andrew n marshall
a9aabd637f Adding warning on duplicate JSON block definition. 2017-02-24 15:41:56 -08:00
Andrew n marshall
89c2bf66ca Merge pull request #951 from AnmAtAnm/fix950-blockfactory 
Fix #950: BlockFactory typo and copypasta
 2017-02-23 10:22:46 -08:00
Andrew n marshall
af6d4dcfc6 Merge pull request #948 from AnmAtAnm/fix946 
Fix #946. Don't check for presence of constants.js
 2017-02-23 10:22:32 -08:00
Andrew n marshall
2279b55057 Merge pull request #949 from AnmAtAnm/fix-annotations 
Fix #945 (annotations) and an eslint issue (constant condition)
 2017-02-23 10:22:17 -08:00
Andrew n marshall
7e178af49c Fix #950: BlockFactory typo and copypasta 2017-02-23 08:53:01 -08:00
Andrew n marshall
3db3cf551f Fix #945 (annotations) and an eslint issue (constant condition) 2017-02-22 23:15:39 -08:00
Andrew n marshall
c5c32b457f Fix #946. Don't check for presence of constants.js 2017-02-22 22:58:39 -08:00
Rachel Fenichel
3d08099950 Merge pull request #809 from google/paternity 
Option for moving one block from stack.
 2017-02-22 10:39:11 -08:00
Andrew n marshall
1bd8204922 Make variable add set/get block in context menu obey block limits (#938 from bwinf/develop) 2017-02-16 08:26:13 -08:00
Robert Czechowski
5a7b7b3c5a Make variable add set/get block in context menu obey block limits 2017-02-16 15:03:50 +01:00
CoryDCode
c3c1f83105 Fixing Enter so it properly propogates to dropdown selection. (#934) 
Fixing FieldSegment so it updates dropdowns when the underlying dropdown changes.
 2017-02-15 11:13:32 -08:00
Rachel Fenichel
0a73ae38f9 Merge pull request #933 from K-ran/bugfix/rounding_error 
Potential bug fix for issue #661
 2017-02-15 09:12:23 -08:00
Karan Purohit
4a81623f8d Code correction from previous commit. Moved style to css.js and set ROUNDING=15; 2017-02-15 14:33:20 +05:30
Andrew n marshall
4b6f98166c Merge pull request #935 from AnmAtAnm/clarification 
Clarification in Blockly.utils.tokenizeInterpolation_
 2017-02-14 16:29:08 -08:00
Andrew n marshall
b32136d81f Clarification update. 
Unraveling nested ternaries in Blockly.utils.tokenizeInterpolation_()
 2017-02-14 15:51:24 -08:00
Andrew n marshall
b0264eb5ea Internationalize variable name strings (#930 from AnmAtAnm/variable_i18n) 
Also, .utils.replaceMessageReferences(..) now gracefully returns non-string arguments.
 2017-02-14 11:58:02 -08:00
Andrew n marshall
afd1fdeb15 .utils.replaceMessageReferences(..) now gracefully returns non-string arguments. 2017-02-14 11:00:34 -08:00
Andrew n marshall
750c0300ec Addressing comments. 2017-02-14 11:00:34 -08:00
Andrew n marshall
dc0d3beba3 Moving FieldImage string dereferencing back into Block.interpolate_() (part of jsonInit()). This sets a clear boundary of where dereferencing should happen. 
Towards this, I've added message dereferencing for other field types here, as well.  I've used a pattern of field-type specific helper functions.
 2017-02-14 11:00:34 -08:00
Andrew n marshall
640fb9c733 Dereference string table references when loading variable fields from JSON. 2017-02-14 11:00:34 -08:00
Andrew n marshall
feed5ffc6d Renamed extension function constant, and moved variables into the mixin. 2017-02-14 09:37:45 -08:00
Andrew n marshall
6919f588f8 extension controls_if => controls_if_mutator. 2017-02-14 09:37:45 -08:00
Karan Purohit
cdef092683 Potential bug fix for issue #661 2017-02-14 23:00:14 +05:30
Andrew n marshall
802c03b4c0 Adding tests for logic_ternary block in a new jsunit test framework. 2017-02-13 16:28:43 -08:00
Andrew n marshall
79becd6b31 Add no-op stub .neighbors() for headless Connection. 2017-02-13 16:28:43 -08:00
Andrew n marshall
2e8d107682 Correcting output of the logic_null block. 2017-02-13 16:28:43 -08:00
Andrew n marshall
6b692a0802 Initial text block, with a mixin to generate quote image fields. (#923) 
Text block now uses the extension "text_quotes", supported by Blockly.Constants.Text.QUOTE_IMAGE_MIXIN.quoteField_(fieldName), so that each platform can use the best platform appropriate image (size, density, etc.) for the quotes.
 2017-02-13 15:00:02 -08:00
Rachel Fenichel
ece21c632a Merge pull request #927 from rachel-fenichel/feature/jsonify_variable_blocks 
JSONify variable blocks
 2017-02-13 09:28:40 -08:00
Rachel Fenichel
e9084aa657 Merge pull request #926 from rachel-fenichel/feature/jsonify_simple_blocks 
JSONify simple list blocks
 2017-02-13 09:28:24 -08:00
Rachel Fenichel
74ff24e323 JSONify variable blocks 2017-02-10 17:05:02 -08:00
Rachel Fenichel
1ff9b6c4c1 JSONify simple list blocks 2017-02-10 16:05:22 -08:00
Rachel Fenichel
3af6238457 Merge pull request #921 from rachel-fenichel/feature/workspace_isMovable 
Workspace isDraggable
 2017-02-08 13:02:42 -08:00
Rachel Fenichel
1a8383180e Workspace isDraggable 2017-02-08 12:31:52 -08:00
Andrew n marshall
a4cfd5cbc8 Porting Loop blocks to JSON (#919) 
* Improved documentation on `Blockly.Extensions.buildTooltipForDropdown`
 * Replaced incorrect uses of `@mixes` JSDoc annotation (on mixin extensions) with `@augments Blockly.Block`.
 * Added Blockly.Extensions.buildTooltipWithFieldValue() extension helper.
 2017-02-08 11:36:38 -08:00
Andrew n marshall
49c9c024e4 Correction to logic_ternary type check (#920) 2017-02-08 10:16:59 -08:00
Andrew n marshall
d97edf0dde Blockly.Constants.Math and Blockly.Constants.Colour extension constants (#916) 
Also, correcting quotes in logic.js.
 2017-02-06 16:20:48 -08:00
Rachel Fenichel
7afefa09f8 Merge pull request #914 from rachel-fenichel/feature/isFieldEditable 
Add isEditable to field, and add tests
 2017-02-06 15:46:33 -08:00
Rachel Fenichel
5a40208138 Separate tests 2017-02-06 15:25:59 -08:00
Rachel Fenichel
630863d9db Add isEditable to field, and add tests 2017-02-06 14:47:45 -08:00
Andrew n marshall
24ebbcaad0 Improving errors/warnings with Block.toDevString() and Connection.toString(). (#911) 2017-02-06 14:15:20 -08:00
Andrew n marshall
680fc4b6d3 Porting Logic blocks to JSON (#913) 
Extensions, mixins, mutators and constants now grouped under the new namespace Blockly.Constants.Logic.
 2017-02-06 13:40:05 -08:00
Rachel Fenichel
e429e0c42f Merge pull request #912 from rachel-fenichel/lint 
Fix some lint errors
 2017-02-06 12:39:45 -08:00
Rachel Fenichel
81eb35fde9 Merge pull request #905 from rachel-fenichel/tests/feb 
Add skeleton for tests on rendered workspaces
 2017-02-06 11:34:59 -08:00
Andrew n marshall
15827c5d30 Adds Block.prototype.mixin() and Blockly.Extensions.registerMixin(). (#907) 
Adds Block.prototype.mixin() and Blockly.Extensions.registerMixin().
This adds support for a common use pattern in extensions, and adds
error checking to avoid future incompatibilities.
 2017-02-06 10:00:08 -08:00
Jim Mussared
ec878b02cd Correct changedState in setWarningText() (#908) 
When clearing warnings on blocks with IDs, the changedState variable should be true if the text changed. This will trigger the block being reshaped and remove the space for the notification icon (this.bumpNeighbours_).
 2017-02-06 08:41:17 -08:00
Rachel Fenichel
4152542c2f Fix some lint errors 2017-02-03 14:01:18 -08:00
Rachel Fenichel
1881b0c3fa Add skeleton for tests on rendered workspaces 2017-02-02 16:08:03 -08:00
CoryDCode
1a1646a5c4 Pinning the angular2 dependency, and including licenses. (#893) 2017-02-02 13:29:02 -08:00