Merge branch 'master' into gh-pages

jeffpar · Dec 10, 2024 · bc91c18 · bc91c18
2 parents 30cf54c + ad6b0e8
commit bc91c18
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 9 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -508,6 +508,18 @@
         "order": 10
       }
     },
+    {
+      "name": "Lite-Brite",
+      "type": "chrome",
+      "request": "launch",
+      "url": "http://localhost:4000/machines/led/lite-brite/",
+      "webRoot": "${workspaceFolder}",
+      "presentation": {
+        "hidden": false,
+        "group": "hardware",
+        "order": 10
+      }
+    },
     {
       "name": "PC.js",
       "type": "node",
@@ -2703,9 +2715,9 @@
       "request": "launch",
       "program": "${workspaceFolder}/tools/private/plex.js",
       "args": [
-        "shows",
-        "rename",
-        "path"
+        "movies",
+        "search",
+        "file"
        ],
       "cwd": "${workspaceFolder}/tools/private",
       "stopOnEntry": false,

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -13,7 +13,7 @@
   "editor.rulers": [127],
   "editor.tabSize": 8,
   "editor.insertSpaces": false,
-  "workbench.colorTheme": "Dark+ Material",
+  "workbench.colorTheme": "Default Dark+",
   "workbench.colorCustomizations": {
     "[Atom One Dark]": {
       "debugToolBar.background": "#21252B"

diff --git a/machines/led/releases/3.00/led-uncompiled.js b/machines/led/releases/3.00/led-uncompiled.js
@@ -9841,6 +9841,8 @@ class LEDCtrl extends CPU {
     {
         let cpu = this, elementInput, patterns;
 
+        super.addBinding(binding, element);
+
         switch(binding) {
         case LEDCtrl.BINDING.COLOR_PALETTE:
         case LEDCtrl.BINDING.COLOR_SELECTION:
@@ -9916,7 +9918,6 @@ class LEDCtrl extends CPU {
                 };
             }
         }
-        super.addBinding(binding, element);
     }
 
     /**

diff --git a/machines/led/releases/3.00/led.js b/machines/led/releases/3.00/led.js
diff --git a/machines/led/releases/3.00/led.js.map b/machines/led/releases/3.00/led.js.map
diff --git a/machines/modules/v3/ledctrl.js b/machines/modules/v3/ledctrl.js
@@ -144,6 +144,8 @@ export default class LEDCtrl extends CPU {
     {
         let cpu = this, elementInput, patterns;
 
+        super.addBinding(binding, element);
+
         switch(binding) {
         case LEDCtrl.BINDING.COLOR_PALETTE:
         case LEDCtrl.BINDING.COLOR_SELECTION:
@@ -219,7 +221,6 @@ export default class LEDCtrl extends CPU {
                 };
             }
         }
-        super.addBinding(binding, element);
     }
 
     /**