diff options
| author | geireann <60007097+geireann@users.noreply.github.com> | 2020-07-26 17:42:34 +0800 |
|---|---|---|
| committer | geireann <60007097+geireann@users.noreply.github.com> | 2020-07-26 17:42:34 +0800 |
| commit | bbdfacd4f748ac1bb0e175aa32b593e2159c6843 (patch) | |
| tree | 12d51d5103bda0ee4b87e904316e772f5e2c4e6a /src/client/util/DropConverter.ts | |
| parent | b83a38a3a92c0149562da460ad9c35eaaf3054ec (diff) | |
| parent | 5454385b6fabbcafee4d797829fb9ceaa8a71ed1 (diff) | |
Merge branch 'master' into presentation_updates
Diffstat (limited to 'src/client/util/DropConverter.ts')
| -rw-r--r-- | src/client/util/DropConverter.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/util/DropConverter.ts b/src/client/util/DropConverter.ts index f9837298d..d0acf14c3 100644 --- a/src/client/util/DropConverter.ts +++ b/src/client/util/DropConverter.ts @@ -57,7 +57,7 @@ export function convertDropDataToButtons(data: DragManager.DocumentDragData) { data?.draggedDocuments.map((doc, i) => { let dbox = doc; // bcz: isButtonBar is intended to allow a collection of linear buttons to be dropped and nested into another collection of buttons... it's not being used yet, and isn't very elegant - if (doc.type === DocumentType.FONTICON) { + if (doc.type === DocumentType.FONTICON || StrCast(Doc.Layout(doc).layout).includes("FontIconBox")) { dbox = Doc.MakeAlias(doc); } else if (!doc.onDragStart && !doc.isButtonBar) { const layoutDoc = doc.layout instanceof Doc && doc.layout.isTemplateForField ? doc.layout : doc; |