Update DevTools extension

Author: apple502j

_locales/pt-br/messages.json

@@ -0,0 +1 @@
+{"extensionName":{"message":"Ferramentas de Desenvolvedor do Scratch 3"},"extensionDescription":{"message":"Ferramentas de Desenvolvedor do Scratch 3 para melhorar sua experiência de edição em https://scratch.mit.edu"}}

addon/DevTools.js

@@ -643,11 +643,7 @@ export default class DevTools {
         continue;
       }
 
-      // blocks._blocks is not iterable, have to do it using an 'in'
-      for (const id in blocks._blocks) {
-        if (!blocks._blocks.hasOwnProperty(id)) {
-          continue;
-        }
+      for (const id of Object.keys(blocks._blocks)) {
         const block = blocks._blocks[id];
         // To find event broadcaster blocks, we look for the nested "event_broadcast_menu" blocks first that match the event name
         if (block.opcode === "event_broadcast_menu" && block.fields.BROADCAST_OPTION.value === name) {

addon/blockly/BlockFlasher.js

@@ -22,7 +22,7 @@ export default class BlockFlasher {
      * @private
      */
     function _flash() {
-      myFlash.block.setColour(flashOn ? "#ffff80" : myFlash.colour);
+      myFlash.block.svgPath_.style.fill = flashOn ? "#ffff80" : myFlash.colour;
       flashOn = !flashOn;
       count--;
       if (count > 0) {

addon/blockly/Utils.js

@@ -47,7 +47,7 @@ export default class Utils {
     const currentWorkspace = Blockly.getMainWorkspace();
     if (currentWorkspace.getToolbox()) {
       // Sadly get get workspace does not always return the 'real' workspace... Not sure how to get that at the moment,
-      //  but we can work out whether it's the right one by whether it hsa a toolbox.
+      //  but we can work out whether it's the right one by whether it has a toolbox.
       this._workspace = currentWorkspace;
     }
     return this._workspace;

addon/userscript.js

@@ -8,7 +8,7 @@ export default async function ({ addon, global, console, msg, safeMsg: m }) {
   }
 
   // 0-indexed 6 = July
-  const releaseDate = new Date(2021, 1, 8);
+  const releaseDate = new Date(2021, 1, 22);
   const releaseDateLocalized = new Intl.DateTimeFormat(msg.locale).format(releaseDate);
 
   const helpHTML = `
@@ -28,7 +28,7 @@ export default async function ({ addon, global, console, msg, safeMsg: m }) {
 </div>
 <div id="s3devHelpContent">
 <p>${m("version", {
-    version: "1.9.0",
+    version: "1.10.0",
     date: releaseDateLocalized,
     ndash: "&ndash;",
     url: '<a target="_blank" rel="noreferrer noopener" href="https://www.youtube.com/griffpatch">Griffpatch</a>',

inject/run-addon.js

@@ -1,6 +1,6 @@
 import Localization from "./l10n.js";
 
-// Make sure SA lower than v1.9.0 doesn't run editor-devtools
+// Make sure SA doesn't run editor-devtools
 window.initGUI = true;
 
 const MAIN_JS = "userscript.js";
@@ -77,6 +77,9 @@ const langCode = `; ${document.cookie}`.split("; scratchlanguage=").pop().split(
 function getL10NURLs() {
   // Note: not identical to Scratch Addons function
   const urls = [getURL(`l10n/${langCode}`)];
+  if (langCode === "pt") {
+    urls.push(getURL(`addons-l10n/pt-br`));
+  }
   if (langCode.includes("-")) {
     urls.push(getURL(`l10n/${langCode.split("-")[0]}`));
   }
@@ -89,6 +92,12 @@ const l10nObject = new Localization(getL10NURLs());
 const msg = (key, placeholders) => l10nObject.get(`editor-devtools/${key}`, placeholders);
 msg.locale = langCode;
 
+const isPageReady = () =>
+  // Make sure <title> element exists to make sure Scratch <style>s were injected,
+  // which are necessary for addon.tab.scratchClass() calls.
+  // We also need the stage element to be there to get the VM object.
+  document.querySelector("title") && document.querySelector('div[class^="stage-wrapper_stage-wrapper_"]');
+
 l10nObject.loadByAddonId("editor-devtools").then(() =>
   import(scriptUrl).then((module) => {
     const loaded = () => {
@@ -105,7 +114,18 @@ l10nObject.loadByAddonId("editor-devtools").then(() =>
         safeMsg: (key, placeholders) => l10nObject.escaped(`editor-devtools/${key}`, placeholders),
       });
     };
-    if (document.readyState === "complete") loaded();
-    else window.addEventListener("load", () => loaded(), { once: true });
+    if (isPageReady()) {
+      if (document.readyState === "complete") loaded();
+      else window.addEventListener("load", () => loaded(), { once: true });
+    } else {
+      const observer = new MutationObserver(() => {
+        if (isPageReady()) {
+          if (document.readyState === "complete") loaded();
+          else window.addEventListener("load", () => loaded(), { once: true });
+          observer.disconnect();
+        }
+      });
+      observer.observe(document.documentElement, { childList: true, subtree: true });
+    }
   })
 );

l10n/de/_general.json

@@ -1 +1 @@
-{"_locale":"de","_locale_name":"Deutsch"}
+{"_locale":"de","_locale_name":"Deutsch","thumb-success":"Thumbnail hochgeladen.","thumb-error":"Fehler beim Hochladen des Thumbnails.","thumb-error-413":"Die Datei ist zu groß.","thumb-error-503":"Der Thumbnail-Server hat ein Problem. Bitte versuche es später erneut."}

l10n/en/_general.json

@@ -1,4 +1,8 @@
 {
   "_locale": "en",
-  "_locale_name": "English"
+  "_locale_name": "English",
+  "thumb-success": "Thumbnail uploaded.",
+  "thumb-error": "Failed to upload thumbnail.",
+  "thumb-error-413": "The file is too big.",
+  "thumb-error-503": "Thumbnail server is having a problem. Please wait and try again."
 }

l10n/es/_general.json

@@ -1 +1 @@
-{"_locale":"es","_locale_name":"español"}
+{"_locale":"es","_locale_name":"español","thumb-success":"Miniatura subida.","thumb-error":"No se pudo subir la miniatura.","thumb-error-413":"El archivo es muy grande.","thumb-error-503":"El servidor de miniaturas está teniendo un problema. Por favor espere e intente de nuevo."}

l10n/fr/_general.json

@@ -1 +1 @@
-{"_locale":"fr","_locale_name":"français"}
+{"_locale":"fr","_locale_name":"français","thumb-success":"Miniature définie.","thumb-error":"Echec lors du téléchargement de la miniature.","thumb-error-413":"Le fichier est trop lourd.","thumb-error-503":"Le serveur des miniatures a un problème. Veuillez réessayer dans quelques minutes"}