diff options
| author | bobzel <zzzman@gmail.com> | 2024-01-04 13:11:22 -0500 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2024-01-04 13:11:22 -0500 |
| commit | ae27dd1689ae1716591aab094e6d41f3a0160fef (patch) | |
| tree | 09735c798abde4fd0b8f234c48375bd6cb1112a4 /src/client/views/collections/collectionFreeForm | |
| parent | ebf32ac65d35053f847fb2cf60f915eb29d6fdd5 (diff) | |
fixed ffmpeg for uploading videos. fixed getView() to take focus options so that if a sidebar or timeline has to be opened, the didMove flag can be set properly. added video snapshot frame to top menu. fixed using '^' to stop and start a selection region on timelines.
Diffstat (limited to 'src/client/views/collections/collectionFreeForm')
| -rw-r--r-- | src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx index a3cedb9a0..8268a47d8 100644 --- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx +++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx @@ -321,9 +321,9 @@ export class CollectionFreeFormView extends CollectionSubView<Partial<collection } }; - getView = async (doc: Doc): Promise<Opt<DocumentView>> => + getView = async (doc: Doc, options: DocFocusOptions): Promise<Opt<DocumentView>> => new Promise<Opt<DocumentView>>(res => { - if (doc.hidden && this._lightboxDoc !== doc) doc.hidden = false; + if (doc.hidden && this._lightboxDoc !== doc) options.didMove = !(doc.hidden = false); const findDoc = (finish: (dv: DocumentView) => void) => DocumentManager.Instance.AddViewRenderedCb(doc, dv => finish(dv)); findDoc(dv => res(dv)); }); |
