Commit Graph

2903 Commits

Author SHA1 Message Date
Christopher Allen
d313ec804a Merge branch 'develop' into goog.module-prep
This resolves a conflict in `blockly_uncompressed.js`, and missing
updates to `test/deps.js`, caused by PR #5041.
2021-07-13 22:16:35 +01:00
jschanker
de1b3214be Enforce connection preconditions for setParent (#4999)
* Fix error conditions for setParent #4989

* Error now thrown when calling `a.setParent(b)` on non-null b if the output/previous connection of a is not connected to an input/next connection of b without removing block from old parent's child list.
* Commented out error for when calling `a.setParent(null)` if a is connected to superior block.
* Adjusted comment to reflect that blocks were no longer being disconnected in this method.
* Also changed == to === per #4924 (`newParent` and `this.parentBlock_` must both be instances of `Blockly.Block`).

* Fix error conditions for setParent #4989

* Error now thrown when calling `a.setParent(b)` on non-null b if the output/previous connection of a is not connected to an input/next connection of b without removing block from old parent's child list.
* Error now thrown when calling `a.setParent(null)` if a is connected to a superior block.
* Adjusted comment to reflect that blocks were no longer being disconnected in this method.
* Also changed == to === per #4924 (`newParent` and `this.parentBlock_` must both be instances of `Blockly.Block`).

* Fix error conditions for setParent #4989

* Error now thrown when calling `a.setParent(b)` on non-null b if the output/previous connection of a is not connected to an input/next connection of b without removing block from old parent's child list.
* Commented out error for when calling `a.setParent(null)` if a is connected to superior block.
* Adjusted comment to reflect that blocks were no longer being disconnected in this method.
* Also changed == to === per google#4924 (`newParent` and `this.parentBlock_` must both be instances of `Blockly.Block`).
* Fixed lint errors.

* Fix error conditions for setParent google#4989

* Error now thrown when calling `a.setParent(b)` on non-null b if the output/previous connection of a is not connected to an input/next connection of b without removing block from old parent's child list.
* Commented out error for when calling `a.setParent(null)` if a is connected to superior block.
* Adjusted comment to reflect that blocks were no longer being disconnected in this method.
* Also changed == to === per google#4924 (`newParent` and `this.parentBlock_` must both be instances of `Blockly.Block`).
* Fixed lint errors.
* Adjusted comment.

* Removed unnecessary set to null/added tests

* One is failing (commented out), will investigate later

* Lint fix

* Removed failing test that correctly fails

* Update comments to conform to style guide

Capitalize first letter, period at end
2021-07-13 13:56:42 -07:00
alschmiedt
2b6b89dc54 Remove themes that were moved to blockly samples (#5041) 2021-07-13 13:31:27 -07:00
Christopher Allen
948fade7c5 Only disable eslint indent check on one line
For whatever reason eslint was rejecting the (styleguide-correct)
indentation of the line beginning with "/** @type ...", and in my
naïvete I got a little more zealous than I intended in suppressing
the error.
2021-07-13 12:08:35 +01:00
Neil Fraser
b3c94db951 Revert "Revert "Group field edits together for undo/redo""
This reverts commit 344ebcfd02.
2021-07-12 09:38:04 -07:00
Aaron Dodson
0b66af2e84 Merge pull request #5020 from hpnrep6/flyout-button
Fix vertical button padding in horizontal flyout
2021-07-12 08:28:28 -07:00
Neil Fraser
8a3c701026 Enable static method inheritance. 2021-07-11 23:20:20 -07:00
Neil Fraser
2c6d044c40 Review updates 2021-07-11 23:19:01 -07:00
Neil Fraser
02fd8cf7a4 Linting 2021-07-11 23:19:01 -07:00
Neil Fraser
cba7a68207 Allow inheriting of fromJson in fields 2021-07-11 23:19:01 -07:00
hpnrep6
048e77dc9a Include button heights in flyout height calculation 2021-07-12 01:26:03 -04:00
Christopher Allen
603755f250 Suppress spurious eslint error
eslint appears to be confused by the leading JSDoc comment on the
continuation line and suggests it should be indented only 4 rather
than 8 spaces.
2021-07-12 03:51:17 +01:00
Christopher Allen
1197afcee7 Fix JSDoc type annotations causing closure-make-deps warnings
Some type annotations were missing curly brackets, which makes
closure-make-deps emit uninteresting warnings.  Now any output
from the command will be informative and related to whatever
one is presently working on.
2021-07-12 03:17:14 +01:00
Rachel Fenichel
89cf049e74 Merge pull request #4995 from BeksOmega/fix/jsdoc
Updates JSDoc in Block and BlockSvg
2021-07-09 15:57:38 -07:00
Rachel Fenichel
61e2d4caee Merge pull request #4985 from maribethb/typo
fix doc typo
2021-07-09 15:31:15 -07:00
Aaron Dodson
3f55ca59ad Merge pull request #4969 from gonfunko/scrollin-safari
Work around WebKit bug that prevents scrolling/zooming the workspace.
2021-07-08 08:25:29 -07:00
Aaron Dodson
49a4fa7898 Merge pull request #4938 from gonfunko/flyout-zoom
Reflow flyouts when zoom level changes to keep block zoom level in sync.
2021-07-07 10:29:44 -07:00
Beka Westberg
a589cd6923 Update jsdoc 2021-07-07 14:42:18 +00:00
Maribeth Bottorff
74f1926b6a fix doc typo 2021-07-01 19:11:06 -07:00
Maribeth Bottorff
d102cbfab4 Fix Jsdoc by removing trailing comma (#4974) 2021-06-30 16:45:02 -07:00
Aaron Dodson
c163a76807 Removed unused event argument. 2021-06-30 17:52:17 +00:00
Aaron Dodson
5aa8bab22f Work around WebKit bug that prevents scrolling/zooming the workspace. 2021-06-30 17:40:00 +00:00
Neil Fraser
344ebcfd02 Revert "Group field edits together for undo/redo"
This reverts commit 33ad2448b8.
2021-06-29 11:35:21 -07:00
Neil Fraser
33ad2448b8 Group field edits together for undo/redo
Fixes #4189.
Also use 0 instead of 0px, in accordance with the rest of Blockly and Google’s CSS style guide.
2021-06-29 09:57:25 -07:00
Rachel Fenichel
5412adf7e5 Merge pull request #4951 from rachel-fenichel/remove_build_py
Remove deprecated build.py script
2021-06-28 11:13:05 -07:00
Rachel Fenichel
5c48bfc188 Tweak comment 2021-06-28 11:09:01 -07:00
Aaron Dodson
627647c7f2 Reflow workspace- and toolbox-owned flyouts when workspace zoom changes. 2021-06-28 11:08:03 -07:00
Aaron Dodson
0d44d22629 Revert "Reflow flyouts when zoom level changes to keep block zoom level in sync."
This reverts commit 1f6c8f0206.
2021-06-28 10:48:36 -07:00
Neil Fraser
9ad50ea98a Fix escape key on all fields. (#4934)
Currently the escape key fails to revert the value.  This is the inherited root of all type-in fields, including number, angle, and note.

Fixes #4910
2021-06-27 23:51:46 -07:00
Rachel Fenichel
2fcdd846be Remove deprecated build.py script 2021-06-24 16:58:28 -07:00
Aaron Dodson
1f6c8f0206 Reflow flyouts when zoom level changes to keep block zoom level in sync. 2021-06-18 20:26:17 +00:00
Beka Westberg
13bb9f5bf6 Refactor connect logic (#4880)
* Refactor connect logic.

* Fixup from rebase

* Fix build

* PR Comments
2021-06-18 09:53:43 -07:00
Neil Fraser
292911062e Honour option for collapse in context menu
Currently the ‘collapse’ option is always present, even if flagged off in the inject options.
2021-06-18 08:23:09 -07:00
Neil Fraser
c8bea1ff3a Remove return value from Field dropdownCreate_ (#4915)
These functions have side effects and set all kinds of private fields.  It is misleading for them to return the top-level element, for the caller to assign to a private field.
2021-06-18 08:22:25 -07:00
Monica Kozbial
7b286dbf82 Update the registered component ids (#4898) 2021-06-17 17:50:04 -07:00
Monica Kozbial
7d45b531ac Update toolbox drag target when visibility changes (#4919) 2021-06-17 15:17:36 -07:00
Aaron Dodson
ad7a40dac4 Merge pull request #4927 from gonfunko/flyout-delete
Fixed bug that prevented delete areas from updating when flyout width changed.
2021-06-17 08:54:09 -07:00
Aaron Dodson
50fcdfb7ac Keep horizontal flyout delete area in sync with its bounds. 2021-06-17 15:39:15 +00:00
Aaron Dodson
de220a3ff0 Fixed bug that prevented delete areas from updating when flyout width changed. 2021-06-16 20:08:44 +00:00
Neil Fraser
36d25343f4 Don’t hide insertion marker if it’s already gone
Fixes #2338.

I also looked at having workspace.clear delete any insertion marker, but there doesn’t appear to be a public API for this.  Shouldn’t matter, this should be sufficient.
2021-06-16 11:48:34 -07:00
Aaron Dodson
9fa6b03789 Merge pull request #4925 from gonfunko/copy-paste
Prevent an error beep when copying blocks in Safari.
2021-06-16 11:16:51 -07:00
Aaron Dodson
7a456a048b Prevent an error beep when copying blocks in Safari. 2021-06-16 17:51:36 +00:00
Monica Kozbial
a15bbf1700 Revert #4697 (#4917) 2021-06-16 09:36:39 -07:00
alschmiedt
a46dbb37e7 Fixes workspace scroll bug (#4921) 2021-06-16 08:18:28 -07:00
jschanker
672574b056 Require field name to be string, test changes
* Now throws error for getField/getFieldValue/setFieldValue if provided name is not a string
* Changed error to more specific TypeError
* Type checking and error message moved up to getField
* Tests added/modified to check that non-string types for field names produce type errors
2021-06-16 10:46:05 +01:00
jschanker
62bb663b38 Added tests/setFieldValue error message
* Added tests for getting/setting field (values) when names are not supplied and test for getting a field value, setting it to a new value, and getting it again.
* Added more user-friendly error message for setFieldValue telling the developer that he/she is missing the name rather than Field "undefined" not found.
* Fixed lint error by removing trailing space
2021-06-16 10:46:05 +01:00
jschanker
f9c5260fb0 Added tests/setFieldValue error message
* Added tests for getting/setting field (values) when names are not supplied and test for getting a field value, setting it to a new value, and getting it again.
* Added more user-friendly error message for setFieldValue telling the developer that he/she is missing the name rather than Field "undefined" not found.
2021-06-16 10:46:05 +01:00
jschanker
ee8e282360 Fix #4830 for getting/setting unnamed fields
* Returns null when getting unnamed field (value), throws error Field "undefined" not found when attempting to set value of unnamed field
2021-06-16 10:46:05 +01:00
Aaron Dodson
f9702deab0 Merge pull request #4911 from gonfunko/ipad-useragent
Updated user agent parsing to detect iPads posing as desktop Safari.
2021-06-15 08:33:01 -07:00
Aaron Dodson
289d8ac857 Adjusted line wrapping. 2021-06-15 15:22:51 +00:00