diff options
| author | mehekj <mehek.jethani@gmail.com> | 2022-03-17 16:56:54 -0400 |
|---|---|---|
| committer | mehekj <mehek.jethani@gmail.com> | 2022-03-17 16:56:54 -0400 |
| commit | 1e3ad4de06f83eab54628de660529fefb9a0dc63 (patch) | |
| tree | b7c05080dac66366768f23e59a43f62533a22415 /src/client/views/collections | |
| parent | cca2faa0bc4083db7b1a0b9cb6a9c5092e332d31 (diff) | |
| parent | 5d50e0673fde8aabb2d87a75624b40d3b9c65df3 (diff) | |
Merge branch 'master' into temporalmedia-mehek
Diffstat (limited to 'src/client/views/collections')
3 files changed, 5 insertions, 4 deletions
diff --git a/src/client/views/collections/CollectionStackedTimeline.tsx b/src/client/views/collections/CollectionStackedTimeline.tsx index 793e01822..7d9dc39ae 100644 --- a/src/client/views/collections/CollectionStackedTimeline.tsx +++ b/src/client/views/collections/CollectionStackedTimeline.tsx @@ -791,7 +791,7 @@ class StackedTimelineAnchor extends React.Component<StackedTimelineAnchorProps> DocListCast(this.props.mark.links).length && time > NumCast(this.props.mark[this.props.startTag]) && time < NumCast(this.props.mark[this.props.endTag]) && - this._lastTimecode < NumCast(this.props.mark[this.props.startTag]) + this._lastTimecode < NumCast(this.props.mark[this.props.startTag]) - 1e-5 ) { LinkManager.FollowLink( undefined, diff --git a/src/client/views/collections/CollectionSubView.tsx b/src/client/views/collections/CollectionSubView.tsx index fc1bcb8b9..34209ebc9 100644 --- a/src/client/views/collections/CollectionSubView.tsx +++ b/src/client/views/collections/CollectionSubView.tsx @@ -446,6 +446,7 @@ export function CollectionSubView<T, X>(schemaCtor: (doc: Doc) => T, moreProps?: generatedDocuments.push(...await DocUtils.uploadFilesToDocs(files, options)); } if (generatedDocuments.length) { + // Creating a dash document const isFreeformView = this.props.Document._viewType === CollectionViewType.Freeform; const set = !isFreeformView ? generatedDocuments : generatedDocuments.length > 1 ? generatedDocuments.map(d => { DocUtils.iconify(d); return d; }) : []; diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.tsx index c35bb3581..f5a5492e3 100644 --- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.tsx +++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.tsx @@ -150,8 +150,8 @@ export class CollectionFreeFormLinkView extends React.Component<CollectionFreeFo } onClickLine = () => { - SelectionManager.SelectSchemaViewDoc(this.props.LinkDocs[0], true) - this.toggleProperties() + SelectionManager.SelectSchemaViewDoc(this.props.LinkDocs[0], true); + this.toggleProperties(); } // componentToHex = (c: number) => { @@ -249,7 +249,7 @@ export class CollectionFreeFormLinkView extends React.Component<CollectionFreeFo //thickness varies linearly from 3px to 12px for increasing link count const strokeWidth = linkSize === -1 ? "3px" : Math.floor(2 + 10 * (linkSize / Math.max(...linkRelationshipSizes))) + "px"; - if (this.props.LinkDocs[0].displayArrow == undefined) { + if (this.props.LinkDocs[0].displayArrow === undefined) { this.props.LinkDocs[0].displayArrow = false; } |