Merge pull request #36579 from code-dot-org/jk-new-background-block-s…

…pritelab Spritelab set background as block
code-dot-org · Nov 4, 2020 · e3caa22 · e3caa22
2 parents a71df14 + a278258
commit e3caa22
Show file tree

Hide file tree

Showing 9 changed files with 654 additions and 169 deletions.
diff --git a/apps/i18n/common/en_us.json b/apps/i18n/common/en_us.json
@@ -75,6 +75,7 @@
   "animationPicker_drawYourOwn": "Draw your own",
   "animationPicker_error": "Error: {message}",
   "animationPicker_failedToParseImage": "The image could not be parsed",
+  "animationPicker_noResultsFound": "Sorry, no results found.",
   "animationPicker_title": "Animation Library",
   "animationPicker_unsupportedType": "Sorry, this file type is not supported.",
   "animationPicker_unsupportedSize": "Please make sure the image you are trying to upload is smaller than 100 KB.",

diff --git a/apps/src/p5lab/AnimationPicker/AnimationPickerBody.jsx b/apps/src/p5lab/AnimationPicker/AnimationPickerBody.jsx
@@ -238,7 +238,7 @@ export default class AnimationPickerBody extends React.Component {
           {(searchQuery !== '' || categoryQuery !== '') &&
             results.length === 0 && (
               <div style={animationPickerStyles.emptyResults}>
-                Sorry, no results found.
+                {msg.animationPicker_noResultsFound()}
               </div>
             )}
           {((searchQuery === '' && categoryQuery === '') ||

diff --git a/apps/src/p5lab/spritelab/commands.js b/apps/src/p5lab/spritelab/commands.js
@@ -242,6 +242,9 @@ export const commands = {
   setBackgroundImage(img) {
     worldCommands.setBackgroundImage.apply(this, [img]);
   },
+  setBackgroundImageAs(img) {
+    worldCommands.setBackgroundImageAs.apply(this, [img]);
+  },
   showTitleScreen(title, subtitle) {
     worldCommands.showTitleScreen(title, subtitle);
   },

diff --git a/apps/src/p5lab/spritelab/commands/worldCommands.js b/apps/src/p5lab/spritelab/commands/worldCommands.js
@@ -29,13 +29,24 @@ export const commands = {
     coreLibrary.background = color;
   },
 
+  // Deprecated. The new background block is setBackgroundImageAs
   setBackgroundImage(img) {
     if (this._preloadedBackgrounds && this._preloadedBackgrounds[img]) {
       let backgroundImage = this._preloadedBackgrounds[img];
       coreLibrary.background = backgroundImage;
     }
   },
 
+  setBackgroundImageAs(img) {
+    if (
+      this._predefinedSpriteAnimations &&
+      this._predefinedSpriteAnimations[img]
+    ) {
+      let backgroundImage = this._predefinedSpriteAnimations[img];
+      coreLibrary.background = backgroundImage;
+    }
+  },
+
   setQuestion(questionText, variableName, setterCallback) {
     coreLibrary.registerQuestion(questionText, variableName, setterCallback);
     getStore().dispatch(addQuestion(questionText, variableName));