diff options
| author | bobzel <zzzman@gmail.com> | 2022-09-22 12:28:59 -0400 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2022-09-22 12:28:59 -0400 |
| commit | c6b0c2b7241f5725408f8e389a90ad79fab5c4aa (patch) | |
| tree | 1d9e27714c1bd133c56b10bfcac4b0cda6fa6b27 /src | |
| parent | 38e56a0eb6d965535be748b5bf7befed6edbc4ee (diff) | |
| parent | 40cc7455e853d306ee2750c51308d095dc2970ef (diff) | |
Merge branch 'master' of https://github.com/brown-dash/Dash-Web
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/views/nodes/trails/PresBox.scss | 1 | ||||
| -rw-r--r-- | src/client/views/nodes/trails/PresBox.tsx | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/client/views/nodes/trails/PresBox.scss b/src/client/views/nodes/trails/PresBox.scss index 7069d2742..34df415ac 100644 --- a/src/client/views/nodes/trails/PresBox.scss +++ b/src/client/views/nodes/trails/PresBox.scss @@ -288,6 +288,7 @@ height: 10px; -webkit-appearance: none; margin-top: -1px; + background: transparent; } .toolbar-slider::-webkit-slider-thumb { diff --git a/src/client/views/nodes/trails/PresBox.tsx b/src/client/views/nodes/trails/PresBox.tsx index 69f817d79..de19f831d 100644 --- a/src/client/views/nodes/trails/PresBox.tsx +++ b/src/client/views/nodes/trails/PresBox.tsx @@ -1430,7 +1430,7 @@ export class PresBox extends ViewBoxBaseComponent<FieldViewProps>() { const activeItem: Doc = this.activeItem; const targetDoc: Doc = this.targetDoc; const clipStart: number = NumCast(activeItem.clipStart); - const clipEnd: number = NumCast(activeItem.clipEnd, NumCast(activeItem.duration)); + const clipEnd: number = NumCast(activeItem.clipEnd, NumCast(activeItem[Doc.LayoutFieldKey(activeItem) + '-duration'])); const mediaStopDocInd: number = NumCast(activeItem.mediaStopDoc); if (activeItem && targetDoc) { return ( |