Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: remove references to colour fields and blocks #2241

Merged
merged 4 commits into from
Mar 15, 2024
Merged

fix: remove references to colour fields and blocks #2241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
faa44c5
chore: delete uses of colour blocks from most other plugins
rachel-fenichel Mar 14, 2024
92e1ff5
chore: delete colour blocks from shadow block converter
rachel-fenichel Mar 14, 2024
1c9110b
chore: stop using colour fields in block-test plugin
rachel-fenichel Mar 14, 2024
433f3c9
fix: param order
rachel-fenichel Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 0 additions & 100 deletions examples/custom-renderer-codelab/src/toolbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,28 +495,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 +600,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
38 changes: 0 additions & 38 deletions examples/custom-toolbox-codelab/complete-code/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,44 +346,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
38 changes: 0 additions & 38 deletions examples/custom-toolbox-codelab/starter-code/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,44 +336,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
65 changes: 0 additions & 65 deletions examples/devsite-demo/toolbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,71 +648,6 @@ const toolboxJson = {
],
},

{
// Colour Category
kind: 'CATEGORY',
colour: '%{BKY_COLOUR_HUE}',
contents: [
{
kind: 'BLOCK',
type: 'colour_picker',
fields: {COLOUR: '#ff0000'},
},
{
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
65 changes: 0 additions & 65 deletions examples/devsite-landing-demo/toolbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,71 +649,6 @@ let toolboxJson = {
],
},

{
// Colour Category
kind: 'CATEGORY',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't save any of the state of the devsite landing demo right?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct

colour: 354,
contents: [
{
kind: 'BLOCK',
type: 'colour_picker',
fields: {COLOUR: '#ff0000'},
},
{
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
Loading
Loading