diff options
author | bobzel <zzzman@gmail.com> | 2021-09-24 22:39:30 -0400 |
---|---|---|
committer | bobzel <zzzman@gmail.com> | 2021-09-24 22:39:30 -0400 |
commit | 534e21a74f646b2e6fd009f6bf910679869797b4 (patch) | |
tree | a228f5cc00af99ddcf5a83a144b641563045da20 | |
parent | 6bcf4ae5f3953ba10ba1fba6c7d2246514a90eed (diff) |
from last
-rw-r--r-- | src/client/views/collections/CollectionStackedTimeline.tsx | 2 | ||||
-rw-r--r-- | src/client/views/nodes/AudioBox.tsx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/client/views/collections/CollectionStackedTimeline.tsx b/src/client/views/collections/CollectionStackedTimeline.tsx index 48014921a..b6321043c 100644 --- a/src/client/views/collections/CollectionStackedTimeline.tsx +++ b/src/client/views/collections/CollectionStackedTimeline.tsx @@ -622,7 +622,7 @@ export class CollectionStackedTimeline extends CollectionSubView< }} /> - {this.IsTrimming && ( + {this.IsTrimming !== TrimScope.None && ( <> <div className="collectionStackedTimeline-trim-shade" diff --git a/src/client/views/nodes/AudioBox.tsx b/src/client/views/nodes/AudioBox.tsx index 81367ed19..7eb5639c0 100644 --- a/src/client/views/nodes/AudioBox.tsx +++ b/src/client/views/nodes/AudioBox.tsx @@ -321,7 +321,7 @@ export class AudioBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProp // for play button Play = (e?: any) => { const eleTime = this._ele!.currentTime; - const start = eleTime === this.timeline?.trimDuration ? NumCast(this.layoutDoc.trimStart) : eleTime; + const start = eleTime === this.timeline?.trimDuration ? this.timeline.trimStart : eleTime; this.playFrom(start, undefined, true); e?.stopPropagation?.(); } |