diff options
| author | Geireann Lindfield Roberts <60007097+geireann@users.noreply.github.com> | 2023-07-18 12:55:43 -0400 |
|---|---|---|
| committer | Geireann Lindfield Roberts <60007097+geireann@users.noreply.github.com> | 2023-07-18 12:55:43 -0400 |
| commit | b62a751b6a16acd28b4f9a9794ded6ea14fa0de8 (patch) | |
| tree | e47448dd49e0de01893c22ba3d52e0a65bbe1a66 | |
| parent | f8d6a1433716de4b2a04a41e5c7b63e1d498bb9c (diff) | |
fixed ClickButton
| -rw-r--r-- | src/client/util/CurrentUserUtils.ts | 2 | ||||
| -rw-r--r-- | src/client/views/nodes/FontIconBox/FontIconBox.tsx | 15 | ||||
| -rw-r--r-- | src/scraping/buxton/narratives/.Theme - Chord Kbds.docx.icloud | bin | 175 -> 0 bytes |
3 files changed, 9 insertions, 8 deletions
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 Binary files differdeleted file mode 100644 index 18b1ced4f..000000000 --- a/src/scraping/buxton/narratives/.Theme - Chord Kbds.docx.icloud +++ /dev/null |