HAT -> EVENT for non edge activated blocks (#856)

TurboWarp · Aug 9, 2023 · 75289fd · 75289fd
1 parent 6657fbd
commit 75289fd
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 23 deletions.
diff --git a/extensions/battery.js b/extensions/battery.js
@@ -81,25 +81,25 @@
           },
           {
             opcode: 'chargingChanged',
-            blockType: Scratch.BlockType.HAT,
+            blockType: Scratch.BlockType.EVENT,
             text: 'when charging changed',
             isEdgeActivated: false
           },
           {
             opcode: 'levelChanged',
-            blockType: Scratch.BlockType.HAT,
+            blockType: Scratch.BlockType.EVENT,
             text: 'when battery level changed',
             isEdgeActivated: false
           },
           {
             opcode: 'chargeTimeChanged',
-            blockType: Scratch.BlockType.HAT,
+            blockType: Scratch.BlockType.EVENT,
             text: 'when time until charged changed',
             isEdgeActivated: false
           },
           {
             opcode: 'dischargeTimeChanged',
-            blockType: Scratch.BlockType.HAT,
+            blockType: Scratch.BlockType.EVENT,
             text: 'when time until empty changed',
             isEdgeActivated: false
           },

diff --git a/extensions/clipboard.js b/extensions/clipboard.js
@@ -46,13 +46,13 @@
         blocks: [
           {
             opcode: 'whenCopied',
-            blockType: Scratch.BlockType.HAT,
+            blockType: Scratch.BlockType.EVENT,
             text: 'when something is copied',
             isEdgeActivated: false
           },
           {
             opcode: 'whenPasted',
-            blockType: Scratch.BlockType.HAT,
+            blockType: Scratch.BlockType.EVENT,
             text: 'when something is pasted',
             isEdgeActivated: false
           },

diff --git a/extensions/gamepad.js b/extensions/gamepad.js
@@ -181,7 +181,7 @@
           /*
           {
             opcode: 'buttonPressedReleased',
-            blockType: Scratch.BlockType.HAT,
+            blockType: Scratch.BlockType.EVENT,
             text: 'button [b] [pr] of pad [i]',
             arguments: {
               b: {
@@ -203,7 +203,7 @@
 
           {
             opcode: 'axisMoved',
-            blockType: Scratch.BlockType.HAT,
+            blockType: Scratch.BlockType.EVENT,
             text: 'axis [b] of pad [i] moved',
             arguments: {
               b: {

diff --git a/extensions/godslayerakp/http.js b/extensions/godslayerakp/http.js
@@ -289,13 +289,13 @@
                     '---',
                     {
                         opcode: 'onResponse',
-                        blockType: BlockType.HAT,
+                        blockType: BlockType.EVENT,
                         isEdgeActivated: false,
                         text: 'when a site responds'
                     },
                     {
                         opcode: 'onFail',
-                        blockType: BlockType.HAT,
+                        blockType: BlockType.EVENT,
                         isEdgeActivated: false,
                         text: 'when a request fails'
                     },
@@ -593,18 +593,6 @@
             return JSON.stringify(object);
         }
 
-        /* -------- EVENTS -------- */
-
-        onResponse() {
-            // filer olo
-            return false;
-        }
-
-        onFail() {
-            // filer olo
-            return false;
-        }
-
         /* -------- CONTROL --------- */
 
         setMimeType(args) {

diff --git a/extensions/local-storage.js b/extensions/local-storage.js
@@ -124,7 +124,7 @@
           },
           {
             opcode: 'whenChanged',
-            blockType: Scratch.BlockType.HAT,
+            blockType: Scratch.BlockType.EVENT,
             text: 'when another window changes storage',
             isEdgeActivated: false
           }