aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/presentationview
diff options
context:
space:
mode:
authorbobzel <zzzman@gmail.com>2020-11-01 10:34:29 -0500
committerGitHub <noreply@github.com>2020-11-01 10:34:29 -0500
commitc8a8f569eefb4daad6da25d9be2a939589ccb704 (patch)
tree3d80acb0fbe028d8c8f1fed3d002c93f4be61ecb /src/client/views/presentationview
parent7b96bc4770bd275db0ddd664bb6e8ff33bbbcb78 (diff)
parent35de050c423edba2be6833492438a5e02f45f938 (diff)
Merge pull request #922 from browngraphicslab/presentation_v1
Presentation v1
Diffstat (limited to 'src/client/views/presentationview')
-rw-r--r--src/client/views/presentationview/PresElementBox.tsx4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/views/presentationview/PresElementBox.tsx b/src/client/views/presentationview/PresElementBox.tsx
index 7a28f8bff..b2acad86e 100644
--- a/src/client/views/presentationview/PresElementBox.tsx
+++ b/src/client/views/presentationview/PresElementBox.tsx
@@ -120,14 +120,14 @@ export class PresElementBox extends ViewBoxBaseComponent<FieldViewProps, PresDoc
if (this.rootDoc.type === DocumentType.AUDIO) { durationInS = NumCast(this.rootDoc.presEndTime) - NumCast(this.rootDoc.presStartTime); durationInS = Math.round(durationInS * 10) / 10; }
else if (this.rootDoc.presDuration) durationInS = NumCast(this.rootDoc.presDuration) / 1000;
else durationInS = 2;
- return this.rootDoc.presMovement === PresMovement.Jump ? (null) : "D: " + durationInS + "s";
+ return "D: " + durationInS + "s";
}
@computed get transition() {
let transitionInS: number;
if (this.rootDoc.presTransition) transitionInS = NumCast(this.rootDoc.presTransition) / 1000;
else transitionInS = 0.5;
- return "M: " + transitionInS + "s";
+ return this.rootDoc.presMovement === PresMovement.Jump || this.rootDoc.presMovement === PresMovement.None ? (null) : "M: " + transitionInS + "s";
}
private _itemRef: React.RefObject<HTMLDivElement> = React.createRef();