Merge branch 'master' of https://github.com/brown-dash/Dash-Web

1 files changed, 8 insertions, 7 deletions

diff --git a/src/client/views/nodes/FontIconBox/FontIconBox.tsx b/src/client/views/nodes/FontIconBox/FontIconBox.tsx
index 39be4022e..f676641ac 100644
--- a/src/client/views/nodes/FontIconBox/FontIconBox.tsx
+++ b/src/client/views/nodes/FontIconBox/FontIconBox.tsx
@@ -398,18 +398,19 @@ export class FontIconBox extends DocComponent<ButtonProps>() {
                 button = this.dropdownButton; 
                 break;
             case ButtonType.ToggleButton: button = this.toggleButton; break;
-            case ButtonType.TextButton: 
-                const script = ScriptCast(this.rootDoc.script);
+            case ButtonType.ClickButton:
+            case ButtonType.ToolButton: 
+                const script = ScriptCast(this.rootDoc.onClick);
                 const checkResult = script?.script.run({ _readOnly_: true }).result;
-                // Script for checking the outcome of the toggle
                 button = (
-                    <Button tooltip={tooltip} color={checkResult ?? backgroundColor} icon={this.Icon(color)!} text={StrCast(this.rootDoc.buttonText)} label={this.label}/>
+                    <IconButton tooltip={tooltip} onPointerDown={() => script?.script.run({ _readOnly_: false })} color={color} icon={this.Icon(color)!} label={this.label}/>
                 );
                 break;
-            case ButtonType.ClickButton:
-            case ButtonType.ToolButton: 
+            case ButtonType.TextButton: 
+                
+                // Script for checking the outcome of the toggle
                 button = (
-                    <IconButton tooltip={tooltip} onPointerDown={() => script?.script.run({ _readOnly_: false })} color={color} icon={this.Icon(color)!} label={this.label}/>
+                    <Button tooltip={tooltip} color={checkResult ?? backgroundColor} icon={this.Icon(color)!} text={StrCast(this.rootDoc.buttonText)} label={this.label}/>
                 );
                 break;
             case ButtonType.MenuButton: button = (