From c0ec0efe6fb03096c9abbee9e5d72e8cab54bf6b Mon Sep 17 00:00:00 2001 From: Bob Zeleznik Date: Tue, 28 Apr 2020 23:02:23 -0400 Subject: from last --- src/client/views/animationtimeline/Timeline.tsx | 4 +--- src/client/views/animationtimeline/Track.tsx | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/client/views/animationtimeline/Timeline.tsx b/src/client/views/animationtimeline/Timeline.tsx index 234d560f1..295c1e18c 100644 --- a/src/client/views/animationtimeline/Timeline.tsx +++ b/src/client/views/animationtimeline/Timeline.tsx @@ -467,9 +467,7 @@ export class Timeline extends React.Component { timeIndicator(lengthString: string, totalTime: number) { if (this.props.Document.isATOn) { return ( - <> -
{`Total: ${this.toReadTime(totalTime)}`}
- +
{`Total: ${this.toReadTime(totalTime)}`}
); } else { diff --git a/src/client/views/animationtimeline/Track.tsx b/src/client/views/animationtimeline/Track.tsx index 9e2ec8886..382bf9b64 100644 --- a/src/client/views/animationtimeline/Track.tsx +++ b/src/client/views/animationtimeline/Track.tsx @@ -35,8 +35,8 @@ export class Track extends React.Component { private primitiveWhitelist = [ "x", "y", - "width", - "height", + "_width", + "_height", "opacity", ]; private objectWhitelist = [ -- cgit v1.2.3-70-g09d2