fixes

psy0rz · Dec 31, 2024 · f13a475 · f13a475
1 parent ce54c09
commit f13a475
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 20 deletions.
diff --git a/ledder/ControlGroup.ts b/ledder/ControlGroup.ts
@@ -26,15 +26,15 @@ export default class ControlGroup extends Control {
     private __loadedValues: Values
 
 
-    public __addCallbacks:CallbackManager< ()=>void>
-    public __resetCallbacks:CallbackManager< ()=>void>
+    public __addCallbacks: CallbackManager<() => void>
+    public __resetCallbacks: CallbackManager<() => void>
 
 
     constructor(name: string = 'root', restartOnChange: boolean = false, collapsed = false) {
         super(name, 'controls', restartOnChange)
 
-        this.__resetCallbacks=new CallbackManager()
-        this.__addCallbacks=new CallbackManager()
+        this.__resetCallbacks = new CallbackManager()
+        this.__addCallbacks = new CallbackManager()
 
         this.meta.collapsed = collapsed
         this.__clear()
@@ -150,16 +150,17 @@ export default class ControlGroup extends Control {
             const controlGroup = new ControlGroup(name, restartOnChange, collapsed)
             this.__add(controlGroup)
 
+            const resetCallbacks=this.__resetCallbacks
+            const addCallbacks=this.__addCallbacks
+
             //pass through
-            controlGroup.__resetCallbacks.register( ()=>
-            {
-                this.__resetCallbacks.trigger()
+            controlGroup.__resetCallbacks.register(() => {
+                    resetCallbacks.trigger()
 
             })
 
-            controlGroup.__addCallbacks.register( ()=>
-            {
-                this.__addCallbacks.trigger()
+            controlGroup.__addCallbacks.register(() => {
+                    addCallbacks.trigger()
             })
 
         }

diff --git a/ledder/server/AnimationManager.ts b/ledder/server/AnimationManager.ts
@@ -33,7 +33,7 @@ export default class AnimationManager {
     public animationClass: typeof Animator
     private animation: Animator
 
-    public changedCallbacks:CallbackManager<(animationName:string, presetName:string)=>void>
+    public changedCallbacks: CallbackManager<(animationName: string, presetName: string) => void>
 
     //parents
     public readonly box: PixelBox
@@ -55,7 +55,7 @@ export default class AnimationManager {
 
         this.createProxies()
 
-        this.changedCallbacks=new CallbackManager()
+        this.changedCallbacks = new CallbackManager()
 
     }
 
@@ -156,9 +156,7 @@ export default class AnimationManager {
         try {
             this.animationName = animationAndPresetPath.match(RegExp("(^.*)/"))[1]
             this.presetName = animationAndPresetPath.match(RegExp("[^/]+$"))[0]
-        }
-        catch (e)
-        {
+        } catch (e) {
             console.error(`Invalid name: ${animationAndPresetPath}`)
             return
         }

diff --git a/presets/Countdown/default.json b/presets/Countdown/default.json
@@ -21,7 +21,7 @@
    "enabled": true
   },
   "Warning time (min)": {
-   "value": 60
+   "value": 10
   },
   "Font": {
    "Font": {
@@ -31,7 +31,7 @@
     "value": 0
    },
    "Font width": {
-    "value": 0
+    "value": 5
    },
    "X": {
     "value": 0
@@ -51,7 +51,7 @@
     "value": 0
    },
    "Text": {
-    "text": ""
+    "text": "Glitchy 2025 countdown dinges"
    },
    "Text color": {
     "r": 33,

diff --git a/presets/Text/Marquee/default.json b/presets/Text/Marquee/default.json
@@ -12,7 +12,7 @@
    "value": 0
   },
   "Text": {
-   "text": "ip=%i"
+   "text": "Marquee"
   },
   "Text color": {
    "r": 33,
@@ -64,7 +64,7 @@
   },
   "Scrolling": {
    "Enabled": {
-    "enabled": true
+    "enabled": false
    },
    "FPS": {
     "value": 60