Skip to content

Commit

Permalink
Merge pull request #45295 from code-dot-org/staging
Browse files Browse the repository at this point in the history 
DTT (Staging > Test) [robo-dtt]
  • Loading branch information
@deploy-code-org
deploy-code-org committed Mar 14, 2022
2 parents f669f5b + 5b715ae commit b67eb02
Show file tree
Hide file tree
Showing 44 changed files with 666 additions and 417 deletions.
11 changes: 0 additions & 11 deletions apps/src/blockly/addons/cdoBlockSvg.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,20 +70,9 @@ export default class BlockSvg extends GoogleBlockly.BlockSvg {
Blockly.ContextMenu.hide();
}.bind(this)
};
const lockToParent = {
text: this.canDisconnectFromParent_
? 'Lock to Parent Block'
: 'Unlock from Parent Block',
enabled: true,
callback: function() {
this.setCanDisconnectFromParent(!this.canDisconnectFromParent_);
Blockly.ContextMenu.hide();
}.bind(this)
};
menuOptions.push(deletable);
menuOptions.push(movable);
menuOptions.push(editable);
menuOptions.push(lockToParent);
}
}

Expand Down
26 changes: 13 additions & 13 deletions dashboard/config/scripts/levels/poetry_hoc_addSprites.level
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions dashboard/config/scripts/levels/poetry_hoc_backgroundEffects.level
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,19 @@
</block>
<block type="Poetry_setFontColor">
<value name="FILL">
<block type="colour_picker">
<shadow type="colour_picker">
<title name="COLOUR">#999999</title>
</block>
</shadow>
</value>
</block>
<block type="Poetry_setTextEffect">
<title name="EFFECT">"fade"</title>
</block>
<block type="Poetry_setBackground">
<value name="COLOR">
<block type="colour_picker" can_disconnect_from_parent="false">
<shadow type="colour_picker" can_disconnect_from_parent="false">
<title name="COLOUR">#ffcc00</title>
</block>
</shadow>
</value>
</block>
<block type="gamelab_setBackgroundImageAs">
Expand Down
16 changes: 8 additions & 8 deletions dashboard/config/scripts/levels/poetry_hoc_events1.level
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@
<next>
<block type="Poetry_setBackground">
<value name="COLOR">
<block type="colour_picker">
<shadow type="colour_picker">
<title name="COLOUR">#cccccc</title>
</block>
</shadow>
</value>
</block>
</next>
Expand Down Expand Up @@ -91,26 +91,26 @@
</block>
<block type="Poetry_setFontColor">
<value name="FILL">
<block type="colour_picker" can_disconnect_from_parent="false">
<shadow type="colour_picker" can_disconnect_from_parent="false">
<title name="COLOUR">#000000</title>
</block>
</shadow>
</value>
</block>
<block type="Poetry_setTextEffect">
<title name="EFFECT">"fade"</title>
</block>
<block type="Poetry_addTextHighlight">
<value name="COLOR">
<block type="colour_picker" can_disconnect_from_parent="false">
<shadow type="colour_picker" can_disconnect_from_parent="false">
<title name="COLOUR">#99ff99</title>
</block>
</shadow>
</value>
</block>
<block type="Poetry_setBackground">
<value name="COLOR">
<block type="colour_picker" can_disconnect_from_parent="false">
<shadow type="colour_picker" can_disconnect_from_parent="false">
<title name="COLOUR">#ffcc00</title>
</block>
</shadow>
</value>
</block>
<block type="gamelab_setBackgroundImageAs">
Expand Down
20 changes: 10 additions & 10 deletions dashboard/config/scripts/levels/poetry_hoc_exemplar2.level
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@
<next>
<block type="Poetry_setFontColor">
<value name="FILL">
<block type="colour_picker">
<shadow type="colour_picker">
<title name="COLOUR">#ffffff</title>
</block>
</shadow>
</value>
<next>
<block type="Poetry_setForegroundEffect">
Expand Down Expand Up @@ -116,9 +116,9 @@
<next>
<block type="Poetry_setFontColor">
<value name="FILL">
<block type="colour_picker">
<shadow type="colour_picker">
<title name="COLOUR">#000000</title>
</block>
</shadow>
</value>
<next>
<block type="Poetry_setBackgroundEffect">
Expand Down Expand Up @@ -150,9 +150,9 @@
<next>
<block type="Poetry_setFontColor">
<value name="FILL">
<block type="colour_picker">
<shadow type="colour_picker">
<title name="COLOUR">#ffffff</title>
</block>
</shadow>
</value>
<next>
<block type="gamelab_makeNewSpriteAnon">
Expand Down Expand Up @@ -206,9 +206,9 @@
<next>
<block type="Poetry_setFontColor">
<value name="FILL">
<block type="colour_picker">
<shadow type="colour_picker">
<title name="COLOUR">#ffffff</title>
</block>
</shadow>
</value>
<next>
<block type="Poetry_setForegroundEffect">
Expand Down Expand Up @@ -243,9 +243,9 @@
<next>
<block type="Poetry_setFontColor">
<value name="FILL">
<block type="colour_picker">
<shadow type="colour_picker">
<title name="COLOUR">#ffff00</title>
</block>
</shadow>
</value>
<next>
<block type="Poetry_destroy">
Expand Down
12 changes: 6 additions & 6 deletions dashboard/config/scripts/levels/poetry_hoc_freeplay.level
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,27 +109,27 @@
</block>
<block type="Poetry_setFontColor" id="14">
<value name="FILL">
<block type="colour_picker" id="15">
<shadow type="colour_picker" id="15">
<field name="COLOUR">#ffcc00</field>
</block>
</shadow>
</value>
</block>
<block type="Poetry_setTextEffect" id="16">
<field name="EFFECT">"fade"</field>
</block>
<block type="Poetry_addTextHighlight" id="17">
<value name="COLOR">
<block type="colour_picker" id="18">
<shadow type="colour_picker" id="18">
<field name="COLOUR">#ffff99</field>
</block>
</shadow>
</value>
</block>
<block type="Poetry_setBackground" id="19">
<value name="COLOR">
<block type="colour_picker" id="20">
<shadow type="colour_picker" id="20">
<field name="COLOUR">#cc0000</field>
</block>
</value>
</shadow>
</block>
<block type="Poetry_setBackgroundEffect" id="21">
<field name="EFFECT">"blooming"</field>
Expand Down
8 changes: 4 additions & 4 deletions dashboard/config/scripts/levels/poetry_hoc_sounds.level
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,19 @@
</block>
<block type="Poetry_setFontColor" id="4">
<value name="FILL">
<block type="colour_picker" id="5">
<shadow type="colour_picker" id="5">
<title name="COLOUR">#000099</title>
</block>
</shadow>
</value>
</block>
<block type="Poetry_setTextEffect" id="6">
<title name="EFFECT">"typewriter"</title>
</block>
<block type="Poetry_setBackground" id="9">
<value name="COLOR">
<block type="colour_picker" id="10">
<shadow type="colour_picker" id="10">
<title name="COLOUR">#ccffff</title>
</block>
</shadow>
</value>
</block>
<block type="gamelab_setBackgroundImageAs" id="11">
Expand Down
12 changes: 6 additions & 6 deletions dashboard/config/scripts/levels/poetry_hoc_spriteBehaviors.level
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,26 +116,26 @@
</block>
<block type="Poetry_setFontColor">
<value name="FILL">
<block type="colour_picker" can_disconnect_from_parent="false">
<shadow type="colour_picker" can_disconnect_from_parent="false">
<title name="COLOUR">#000099</title>
</block>
</shadow>
</value>
</block>
<block type="Poetry_setTextEffect">
<title name="EFFECT">"fade"</title>
</block>
<block type="Poetry_addTextHighlight">
<value name="COLOR">
<block type="colour_picker" can_disconnect_from_parent="false">
<shadow type="colour_picker" can_disconnect_from_parent="false">
<title name="COLOUR">#99ff99</title>
</block>
</shadow>
</value>
</block>
<block type="Poetry_setBackground">
<value name="COLOR">
<block type="colour_picker" can_disconnect_from_parent="false">
<shadow type="colour_picker" can_disconnect_from_parent="false">
<title name="COLOUR">#ccffff</title>
</block>
</shadow>
</value>
</block>
<block type="gamelab_setBackgroundImageAs">
Expand Down
16 changes: 8 additions & 8 deletions dashboard/config/scripts/levels/poetry_hoc_spriteSizes.level
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
<next>
<block type="Poetry_setFontColor">
<value name="FILL">
<block type="colour_picker">
<shadow type="colour_picker">
<title name="COLOUR">#996633</title>
</block>
</shadow>
</value>
<next>
<block type="Poetry_setTextEffect">
Expand Down Expand Up @@ -131,26 +131,26 @@
</block>
<block type="Poetry_setFontColor">
<value name="FILL">
<block type="colour_picker" can_disconnect_from_parent="false">
<shadow type="colour_picker" can_disconnect_from_parent="false">
<title name="COLOUR">#993399</title>
</block>
</shadow>
</value>
</block>
<block type="Poetry_setTextEffect">
<title name="EFFECT">"flyBottom"</title>
</block>
<block type="Poetry_addTextHighlight">
<value name="COLOR">
<block type="colour_picker" can_disconnect_from_parent="false">
<shadow type="colour_picker" can_disconnect_from_parent="false">
<title name="COLOUR">#ffcccc</title>
</block>
</shadow>
</value>
</block>
<block type="Poetry_setBackground">
<value name="COLOR">
<block type="colour_picker" can_disconnect_from_parent="false">
<shadow type="colour_picker" can_disconnect_from_parent="false">
<title name="COLOUR">#99ffff</title>
</block>
</shadow>
</value>
</block>
<block type="gamelab_setBackgroundImageAs">
Expand Down
40 changes: 20 additions & 20 deletions dashboard/config/scripts/levels/poetry_module_animate_addline.level
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,72 +60,72 @@
<next>
<block type="Poetry_setTitle" deletable="false">
<value name="TITLE">
<block type="Poetry_stringValue" deletable="false">
<shadow type="Poetry_stringValue" deletable="false">
<title name="TEXT">Nothing Gold Can Stay</title>
</block>
</shadow>
</value>
<next>
<block type="Poetry_setAuthor" deletable="false">
<value name="AUTHOR">
<block type="Poetry_stringValue" deletable="false">
<shadow type="Poetry_stringValue" deletable="false">
<title name="TEXT">Robert Frost</title>
</block>
</shadow>
</value>
<next>
<block type="Poetry_addLine" deletable="false">
<value name="LINE">
<block type="Poetry_stringValue" deletable="false">
<shadow type="Poetry_stringValue" deletable="false">
<title name="TEXT">Nature's first green is gold,</title>
</block>
</shadow>
</value>
<next>
<block type="Poetry_addLine" deletable="false">
<value name="LINE">
<block type="Poetry_stringValue" deletable="false">
<shadow type="Poetry_stringValue" deletable="false">
<title name="TEXT">Her hardest hue to hold, </title>
</block>
</shadow>
</value>
<next>
<block type="Poetry_addLine" deletable="false">
<value name="LINE">
<block type="Poetry_stringValue" deletable="false">
<shadow type="Poetry_stringValue" deletable="false">
<title name="TEXT">Her early leaf's a flower;</title>
</block>
</shadow>
</value>
<next>
<block type="Poetry_addLine" deletable="false">
<value name="LINE">
<block type="Poetry_stringValue" deletable="false">
<shadow type="Poetry_stringValue" deletable="false">
<title name="TEXT">But only so an hour.</title>
</block>
</shadow>
</value>
<next>
<block type="Poetry_addLine" deletable="false">
<value name="LINE">
<block type="Poetry_stringValue" deletable="false">
<shadow type="Poetry_stringValue" deletable="false">
<title name="TEXT">Then leaf subsides to leaf.</title>
</block>
</shadow>
</value>
<next>
<block type="Poetry_addLine" deletable="false">
<value name="LINE">
<block type="Poetry_stringValue" deletable="false">
<shadow type="Poetry_stringValue" deletable="false">
<title name="TEXT">So Eden sank to grief,</title>
</block>
</shadow>
</value>
<next>
<block type="Poetry_addLine" deletable="false">
<value name="LINE">
<block type="Poetry_stringValue" deletable="false">
<shadow type="Poetry_stringValue" deletable="false">
<title name="TEXT">So dawn goes down to day.</title>
</block>
</shadow>
</value>
<next>
<block type="Poetry_addLine" deletable="false">
<value name="LINE">
<block type="Poetry_stringValue" deletable="false">
<shadow type="Poetry_stringValue" deletable="false">
<title name="TEXT">Nothing gold can stay.</title>
</block>
</shadow>
</value>
<next>
<block type="Poetry_animateText" deletable="false"/>
Expand Down

0 comments on commit b67eb02

Please sign in to comment.