Commit graph

1671 commits

Author SHA1 Message Date
Rachel Fenichel
c6ff049c92 Merge branch 'develop' into feature/variable_management 2016-08-12 14:39:32 -07:00
Rodrigo Queiro
729bd588f4 Use correct field name - fixes #559 (#561) 2016-08-10 11:35:40 -04:00
Rodrigo Queiro
8e1b22757b Adjust vertical alignment of horizontal field text (#558)
Fixes #555.
2016-08-09 14:41:57 -04:00
rachel-fenichel
0b87100b2a Merge pull request #554 from drigz/cleanup/double-require
Remove duplicated FieldNumber require
2016-08-09 11:15:16 -07:00
rachel-fenichel
e0068cab41 Merge pull request #557 from drigz/bugfix/headless-render
Don't call SVG methods on headless workspaces
2016-08-09 11:10:52 -07:00
Rodrigo Queiro
0012fccb4a Don't call SVG methods on headless workspaces
This fixes XML import for headless workspaces. The bug was introduced by
8e652db (a merge of google/blockly/develop), which moved the code outside
the `if (workspace.rendered)` guard. See:

* [parent 1](c92504fd98/core/xml.js (L357))
* [parent 2](efc2ca3/core/xml.js (L356))
* [merge](8e652db9fe/core/xml.js (L359))
2016-08-09 14:57:22 +02:00
Rodrigo Queiro
99028b13a1 Remove duplicated FieldNumber require 2016-08-09 12:31:26 +02:00
Tim Mickel
b4826b4065 Draw squares for non-droppable dropdown fields (#551) 2016-07-27 16:29:02 -04:00
Tim Mickel
6006f24801 Add special case for colour picker stroke (#548) 2016-07-26 14:30:09 -04:00
Tim Mickel
32ec18a6a7 Add resizeSvgContents to block_svg:moveBy (#546) 2016-07-26 12:18:38 -04:00
Tim Mickel
07f59f731d Recompile July 26 (#545) 2016-07-26 11:55:41 -04:00
Tim Mickel
3f3862a5a8 Various tweaks to shape and size (#544)
* Align text by consistent baseline

* Helvetica

* CORNER_RADIUS in grid units

* Separate MIN_BLOCK_X for reporters from single-field shadows

* Update Blockly.BlockSvg.FIELD_WIDTH

* Remove padding on htmlInput

* Also apply border-radius to htmlInput_ to avoid weird edge effect in Chrome

* Update MIN_BLOCK_X to spec

* Fix horizontal sizing of blocks to include right corner.

* Add EDITABLE_FIELD_PADDING

This gives extra width to editable text fields.

* Add correct height for reporters

* Fix INLINE_PADDING_Y and reporter sizing to spec

* Remove unused case for input.renderWidth

* Instrument vertical rendering with right/left row padding.

* Revert renderWidth change

* Fix calculation of input shape widths

* Output padding to spec, fixing #376

* Update horizontal FIELD_TOP_PADDING for new dominant baseline

* Update padding language to be LTR/RTL neutral

* Remove broken RTL SEP_SPACE_X from input shape drawing
2016-07-26 11:52:05 -04:00
Rachel Fenichel
dfc142eb37 Merge remote-tracking branch 'googsblockly/feature/variable_management' into feature/variable_management 2016-07-15 15:32:42 -07:00
rachel-fenichel
83d8627e49 Merge pull request #480 from rachel-fenichel/feature/merge_develop
Merge back from develop
2016-07-15 14:24:58 -07:00
Rachel Fenichel
f040929bd8 Merge remote-tracking branch 'upstream/develop' into feature/merge_develop 2016-07-15 13:07:07 -07:00
joaoh1
ea4f364f3a Allow Variable use text as Value (#539)
I don't know if this is a feature or a bug '_'
2016-07-15 13:51:41 -04:00
Tim Mickel
76e42b1690 Also inherit border-color on .arrowTop and .arrowBottom (#538) 2016-07-15 11:51:42 -04:00
Tim Mickel
069cc81871 Feature/colors july 15 (#537)
* Colours July 15, based on updated spec

* Recompile July 15
2016-07-15 11:42:52 -04:00
Sean Lip
cc6252cc00 Set activedescendant correctly on workspace trees. 2016-07-14 15:52:58 -07:00
rachel-fenichel
b94c6575bd Merge pull request #477 from rachel-fenichel/bugfix/paste_deleted_variable
Correctly update variable list when pasting code
2016-07-14 15:40:22 -07:00
Rachel Fenichel
dfe61087f0 Correctly update variable list when pasting code 2016-07-14 15:39:41 -07:00
rachel-fenichel
98d73d1b4c Remove to javascript button from playgrounds (#534) 2016-07-14 16:30:14 -04:00
Sean Lip
85f2ae8761 Set active descendant correctly for toolbox tree. Change roles to 'tree' where appropriate. 2016-07-14 11:50:05 -07:00
Tim Mickel
32fd019e08 Recompile July 14 (#517) 2016-07-14 11:20:51 -04:00
joaoh1
b9b8284c5d Make Red the Color Placeholder (#516) 2016-07-14 11:16:23 -04:00
Neil Fraser
7a92facc3a Fix angle field. 2016-07-13 16:58:43 -07:00
Rachel Fenichel
acbb456f0a Update variable list when copying in new blocks 2016-07-13 16:46:27 -07:00
Rachel Fenichel
6d37ebf6b1 Stop i from showing up everywhere 2016-07-13 16:28:41 -07:00
Rachel Fenichel
18be9d1de8 Merge branch 'feature/variable_management' of https://github.com/google/blockly into feature/variable_management 2016-07-13 14:36:35 -07:00
rachel-fenichel
97801a0e2f Merge pull request #472 from rachel-fenichel/feature/all_variables
Distinguish between allVariables and allUsedVariables
2016-07-13 12:54:37 -07:00
Rachel Fenichel
75e06de477 Use instanceof to distinguish between blocks and workspaces. 2016-07-13 12:50:44 -07:00
Tim Mickel
eb1ddddbb0 Fix angleValidator reference and lint @this (#515) 2016-07-13 14:25:32 -04:00
rachel-fenichel
e25456edb4 Merge pull request #514 from rachel-fenichel/bugfix/merge_problems
Fix connection disposal and get rid of startFlyout_
2016-07-13 10:51:16 -07:00
Rachel Fenichel
df1b765384 Create block differently from autoclosing flyout 2016-07-12 15:34:20 -07:00
Rachel Fenichel
3202fcbd0c Fix connection disposal and get rid of startFlyout_ 2016-07-12 15:15:35 -07:00
Neil Fraser
f12c95f4a9 Routine recompile. 2016-07-12 11:36:47 -07:00
Neil Fraser
13d9ecdca0 Merge branch 'master' into develop 2016-07-12 11:35:08 -07:00
Rodrigo Queiro
d3d0ca4fd0 Record whether the workspace has been dragged (#475)
* Record whether the workspace has been dragged

This fixes #473 by differentiating between a touch on an unmovable block
and using it to drag the workspace.

* Remove isScrolling and add DRAG_BEGIN

Applied after PR review.
2016-07-12 11:34:02 -07:00
Tim Mickel
b7c7cbd20f Add math_integer block and use it in go back _ layers (#513) 2016-07-12 14:33:26 -04:00
Neil Fraser
823bf3c5da Allow substituted strings in interpolation. 2016-07-12 11:24:39 -07:00
Tim Mickel
d3ea97cecc Flip vertical toolbox XML category order (#511) 2016-07-12 11:25:24 -04:00
Neil Fraser
612e0c0aac Reverting three invalid translations. 2016-07-11 16:58:56 -07:00
Rodrigo Queiro
ab03c4f411 Remove out-of-date comment (#474)
This comment made sense [before multiple workspace support](67140282a0/core/blockly.js (L297)), where it was near a (Blockly.readOnly || isTargetSvg) check. Now, this logic is implemented in BlockSvg.onMouseDown_() instead.
2016-07-11 16:43:29 -07:00
rachel-fenichel
52244856c6 Merge pull request #510 from rachel-fenichel/feature/pull_google/7_11
Merge from upstream
2016-07-11 16:13:49 -07:00
Rachel Fenichel
8e652db9fe Merge branch 'develop' of https://github.com/google/blockly into feature/pull_google/7_11 2016-07-11 15:53:14 -07:00
Tim Mickel
d80b588a4a Fix angle picker: use drop-down div, Scratch-style direction (#493)
* Scratch-style FieldAngle, use DropDownDiv

* Use FieldAngle for pointindirection

* Fix FieldNumber JSON args

* Convert all math blocks to JSON

* Line length in field_angle

* Remove automatic injection of angleValidator
2016-07-11 16:57:04 -04:00
Tim Mickel
c92504fd98 Update block usages in simple flyout demo (#507) 2016-07-11 14:55:12 -04:00
Tim Mickel
30880a085c Browser consistency for keycode special events (#506)
* Browser consistency for keycode special events

* Fix whitelisting max

* Update comments and charCode=127
2016-07-11 14:46:02 -04:00
Tim Mickel
37dcd9b045 Blocks lint and licenses (#505) 2016-07-11 11:00:33 -04:00
Niklas Laxström
c9437ec7c4 Localisation updates from https://translatewiki.net. 2016-07-11 08:37:32 +02:00