From 3ca997bd7b50f3e7c5bcb9296289c7478e32f91b Mon Sep 17 00:00:00 2001
From: eperelm2 <emily_perelman@brown.edu>
Date: Fri, 9 Jun 2023 23:33:40 -0400
Subject: changed some buttons but might break

---
 .../buxton/narratives/.Theme - Chord Kbds.docx.icloud | Bin 0 -> 175 bytes
 .../buxton/narratives/Theme - Chord Kbds.docx         | Bin 5701815 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/scraping/buxton/narratives/.Theme - Chord Kbds.docx.icloud
 delete mode 100644 src/scraping/buxton/narratives/Theme - Chord Kbds.docx

(limited to 'src/scraping')

diff --git a/src/scraping/buxton/narratives/.Theme - Chord Kbds.docx.icloud b/src/scraping/buxton/narratives/.Theme - Chord Kbds.docx.icloud
new file mode 100644
index 000000000..18b1ced4f
Binary files /dev/null and b/src/scraping/buxton/narratives/.Theme - Chord Kbds.docx.icloud differ
diff --git a/src/scraping/buxton/narratives/Theme - Chord Kbds.docx b/src/scraping/buxton/narratives/Theme - Chord Kbds.docx
deleted file mode 100644
index 439a7d975..000000000
Binary files a/src/scraping/buxton/narratives/Theme - Chord Kbds.docx and /dev/null differ
-- 
cgit v1.2.3-70-g09d2


From b62a751b6a16acd28b4f9a9794ded6ea14fa0de8 Mon Sep 17 00:00:00 2001
From: Geireann Lindfield Roberts <60007097+geireann@users.noreply.github.com>
Date: Tue, 18 Jul 2023 12:55:43 -0400
Subject: fixed ClickButton

---
 src/client/util/CurrentUserUtils.ts                      |   2 +-
 src/client/views/nodes/FontIconBox/FontIconBox.tsx       |  15 ++++++++-------
 .../buxton/narratives/.Theme - Chord Kbds.docx.icloud    | Bin 175 -> 0 bytes
 3 files changed, 9 insertions(+), 8 deletions(-)
 delete mode 100644 src/scraping/buxton/narratives/.Theme - Chord Kbds.docx.icloud

(limited to 'src/scraping')

diff --git a/src/client/util/CurrentUserUtils.ts b/src/client/util/CurrentUserUtils.ts
index d93ee9a2e..a7775715c 100644
--- a/src/client/util/CurrentUserUtils.ts
+++ b/src/client/util/CurrentUserUtils.ts
@@ -822,7 +822,7 @@ export class CurrentUserUtils {
     
         const reqdBtnOpts:DocumentOptions = { _forceActive: true, toolTip: "Import from computer",
             _width: 30, _height: 30, color: Colors.BLACK, _dragOnlyWithinContainer: true, _layout_hideContextMenu: true, title: "Import", btnType: ButtonType.ClickButton, 
-            buttonText: "Import", icon: "upload", isSystem: true };
+            buttonText: "Import", icon: "upload", isSystem: true, ignoreClick: true };
         DocUtils.AssignDocField(myImports, "layout_headerButton", (opts) => Docs.Create.FontIconDocument(opts), reqdBtnOpts, undefined, { onClick: "importDocument()" });
         return myImports;
     }
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 = (
diff --git a/src/scraping/buxton/narratives/.Theme - Chord Kbds.docx.icloud b/src/scraping/buxton/narratives/.Theme - Chord Kbds.docx.icloud
deleted file mode 100644
index 18b1ced4f..000000000
Binary files a/src/scraping/buxton/narratives/.Theme - Chord Kbds.docx.icloud and /dev/null differ
-- 
cgit v1.2.3-70-g09d2