Skip to content

Commit

Permalink
chore: remove references to plugin-ified fields and blocks (#2302)
Browse files Browse the repository at this point in the history 
* fix: remove references to colour fields and blocks (#2241)

* chore: delete uses of colour blocks from most other plugins

* chore: delete colour blocks from shadow block converter

* chore: stop using colour fields in block-test plugin

* fix: param order

* chore: remove uses of the multiline block or field in other plugins (#2239)
  • Loading branch information
@rachel-fenichel
rachel-fenichel authored Apr 2, 2024
1 parent 2586fe6 commit f6140c2
Show file tree
Hide file tree
Showing 19 changed files with 44 additions and 1,340 deletions.
4 changes: 0 additions & 4 deletions examples/backpack-demo/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,6 @@ const toolbox = {
kind: 'block',
type: 'text',
},
{
kind: 'block',
type: 'text_multiline',
},
{
'kind': 'label',
'text': 'Input/Output:',
Expand Down
104 changes: 0 additions & 104 deletions examples/custom-renderer-codelab/src/toolbox.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,10 +328,6 @@ export const toolbox = {
kind: 'block',
type: 'text',
},
{
kind: 'block',
type: 'text_multiline',
},
{
kind: 'block',
type: 'text_join',
Expand Down Expand Up @@ -495,28 +491,6 @@ export const toolbox = {
},
},
},
{
kind: 'block',
type: 'add_text',
inputs: {
TEXT: {
shadow: {
type: 'text',
fields: {
TEXT: 'abc',
},
},
},
COLOR: {
shadow: {
type: 'colour_picker',
fields: {
COLOUR: '#aa00cc',
},
},
},
},
},
],
},
{
Expand Down Expand Up @@ -622,84 +596,6 @@ export const toolbox = {
},
],
},
{
kind: 'category',
name: 'Color',
categorystyle: 'colour_category',
contents: [
{
kind: 'block',
type: 'colour_picker',
},
{
kind: 'block',
type: 'colour_random',
},
{
kind: 'block',
type: 'colour_rgb',
inputs: {
RED: {
shadow: {
type: 'math_number',
fields: {
NUM: 100,
},
},
},
GREEN: {
shadow: {
type: 'math_number',
fields: {
NUM: 50,
},
},
},
BLUE: {
shadow: {
type: 'math_number',
fields: {
NUM: 0,
},
},
},
},
},
{
kind: 'block',
type: 'colour_blend',
inputs: {
COLOUR1: {
shadow: {
type: 'colour_picker',
fields: {
COLOUR: '#ff0000',
},
},
},
COLOUR2: {
shadow: {
type: 'colour_picker',
fields: {
COLOUR: '#3333ff',
},
},
},
RATIO: {
shadow: {
type: 'math_number',
fields: {
NUM: 0.5,
},
},
},
},
},
],
},
{
kind: 'sep',
},
{
kind: 'category',
name: 'Variables',
Expand Down
39 changes: 0 additions & 39 deletions examples/custom-toolbox-codelab/complete-code/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,6 @@ <h1>Toolbox Customization Codelab</h1>
</category>
<category name="Text" categorystyle="text_category">
<block type="text"></block>
<block type="text_multiline"></block>
<block type="text_join"></block>
<block type="text_append">
<value name="TEXT">
Expand Down Expand Up @@ -346,44 +345,6 @@ <h1>Toolbox Customization Codelab</h1>
<block type="lists_sort"></block>
<block type="lists_reverse"></block>
</category>
<category name="Colour" categorystyle="colour_category">
<block type="colour_picker"></block>
<block type="colour_random"></block>
<block type="colour_rgb">
<value name="RED">
<shadow type="math_number">
<field name="NUM">100</field>
</shadow>
</value>
<value name="GREEN">
<shadow type="math_number">
<field name="NUM">50</field>
</shadow>
</value>
<value name="BLUE">
<shadow type="math_number">
<field name="NUM">0</field>
</shadow>
</value>
</block>
<block type="colour_blend">
<value name="COLOUR1">
<shadow type="colour_picker">
<field name="COLOUR">#ff0000</field>
</shadow>
</value>
<value name="COLOUR2">
<shadow type="colour_picker">
<field name="COLOUR">#3333ff</field>
</shadow>
</value>
<value name="RATIO">
<shadow type="math_number">
<field name="NUM">0.5</field>
</shadow>
</value>
</block>
</category>
<sep></sep>
<category
name="Variables"
Expand Down
39 changes: 0 additions & 39 deletions examples/custom-toolbox-codelab/starter-code/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ <h1>Toolbox Customization Codelab</h1>
</category>
<category name="Text" categorystyle="text_category">
<block type="text"></block>
<block type="text_multiline"></block>
<block type="text_join"></block>
<block type="text_append">
<value name="TEXT">
Expand Down Expand Up @@ -336,44 +335,6 @@ <h1>Toolbox Customization Codelab</h1>
<block type="lists_sort"></block>
<block type="lists_reverse"></block>
</category>
<category name="Colour" categorystyle="colour_category">
<block type="colour_picker"></block>
<block type="colour_random"></block>
<block type="colour_rgb">
<value name="RED">
<shadow type="math_number">
<field name="NUM">100</field>
</shadow>
</value>
<value name="GREEN">
<shadow type="math_number">
<field name="NUM">50</field>
</shadow>
</value>
<value name="BLUE">
<shadow type="math_number">
<field name="NUM">0</field>
</shadow>
</value>
</block>
<block type="colour_blend">
<value name="COLOUR1">
<shadow type="colour_picker">
<field name="COLOUR">#ff0000</field>
</shadow>
</value>
<value name="COLOUR2">
<shadow type="colour_picker">
<field name="COLOUR">#3333ff</field>
</shadow>
</value>
<value name="RATIO">
<shadow type="math_number">
<field name="NUM">0.5</field>
</shadow>
</value>
</block>
</category>
<sep></sep>
<category
name="Variables"
Expand Down
101 changes: 0 additions & 101 deletions examples/keyboard-navigation-codelab/src/toolbox.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,10 +328,6 @@ export const toolbox = {
kind: 'block',
type: 'text',
},
{
kind: 'block',
type: 'text_multiline',
},
{
kind: 'block',
type: 'text_join',
Expand Down Expand Up @@ -495,28 +491,6 @@ export const toolbox = {
},
},
},
{
kind: 'block',
type: 'add_text',
inputs: {
TEXT: {
shadow: {
type: 'text',
fields: {
TEXT: 'abc',
},
},
},
COLOR: {
shadow: {
type: 'colour_picker',
fields: {
COLOUR: '#aa00cc',
},
},
},
},
},
],
},
{
Expand Down Expand Up @@ -622,81 +596,6 @@ export const toolbox = {
},
],
},
{
kind: 'category',
name: 'Color',
categorystyle: 'colour_category',
contents: [
{
kind: 'block',
type: 'colour_picker',
},
{
kind: 'block',
type: 'colour_random',
},
{
kind: 'block',
type: 'colour_rgb',
inputs: {
RED: {
shadow: {
type: 'math_number',
fields: {
NUM: 100,
},
},
},
GREEN: {
shadow: {
type: 'math_number',
fields: {
NUM: 50,
},
},
},
BLUE: {
shadow: {
type: 'math_number',
fields: {
NUM: 0,
},
},
},
},
},
{
kind: 'block',
type: 'colour_blend',
inputs: {
COLOUR1: {
shadow: {
type: 'colour_picker',
fields: {
COLOUR: '#ff0000',
},
},
},
COLOUR2: {
shadow: {
type: 'colour_picker',
fields: {
COLOUR: '#3333ff',
},
},
},
RATIO: {
shadow: {
type: 'math_number',
fields: {
NUM: 0.5,
},
},
},
},
},
],
},
{
kind: 'sep',
},
Expand Down
19 changes: 0 additions & 19 deletions examples/rtl-demo/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,25 +335,6 @@
},
],
},
{
kind: 'category',
name: 'لون',
colour: '%{BKY_COLOUR_HUE}',
contents: [
{
kind: 'block',
type: 'colour_picker',
},
{
kind: 'block',
type: 'colour_rgb',
},
{
kind: 'block',
type: 'colour_blend',
},
],
},
{
kind: 'sep',
},
Expand Down
Loading

0 comments on commit f6140c2

Please sign in to comment.