aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/client/views/animationtimeline/Keyframe.tsx1
-rw-r--r--src/client/views/animationtimeline/Timeline.tsx48
-rw-r--r--src/client/views/animationtimeline/Track.tsx5
3 files changed, 1 insertions, 53 deletions
diff --git a/src/client/views/animationtimeline/Keyframe.tsx b/src/client/views/animationtimeline/Keyframe.tsx
index d53000460..482d066ba 100644
--- a/src/client/views/animationtimeline/Keyframe.tsx
+++ b/src/client/views/animationtimeline/Keyframe.tsx
@@ -137,7 +137,6 @@ interface IProps {
tickSpacing: number;
tickIncrement: number;
time: number;
- check: string;
changeCurrentBarX: (x: number) => void;
transform: Transform;
makeKeyData: (region:RegionData, pos: number, kftype:KeyframeFunc.KeyframeType) => Doc;
diff --git a/src/client/views/animationtimeline/Timeline.tsx b/src/client/views/animationtimeline/Timeline.tsx
index 604827213..da9c361da 100644
--- a/src/client/views/animationtimeline/Timeline.tsx
+++ b/src/client/views/animationtimeline/Timeline.tsx
@@ -79,7 +79,6 @@ export class Timeline extends React.Component<FieldViewProps> {
// so a reaction can be made
@observable public _isAuthoring = this.props.Document.isATOn;
- @observable private _resizeReaction?: IReactionDisposer;
@observable private _panelWidth = 0;
/**
@@ -119,19 +118,6 @@ export class Timeline extends React.Component<FieldViewProps> {
this.props.Document.isATOn = !this.props.Document.isATOn; //turns the boolean on, saying AT (animation timeline) is on
this.toggleHandle();
});
-
- this._resizeReaction = reaction(
- () => this.props.PanelWidth,
- () => {
- // if (!this.props.parent._isAuthoring) {
- // runInAction(() => {
- console.log("resizing");
- // this.setOverviewWidth();
- // });
- // }
- },
- );
-
}
componentWillUnmount() {
@@ -527,30 +513,6 @@ export class Timeline extends React.Component<FieldViewProps> {
}
- @observable private _check: string = "";
- @observable private _checkVisible: boolean = false;
- @action
- private onCheckClicked = (type: string) => {
- if (type === "yes") {
- this._check = "yes";
- } else if (type === "no") {
- this._check = "no";
- }
- }
-
-
- /**
- * check mark thing that needs to be fixed. Do not edit this, because it most likely change.
- */
- @action
- private checkCallBack = (visible: boolean) => {
- this._checkVisible = visible;
- if (!visible) { //when user confirms
- this._check = "";
- }
-
- }
-
@action.bound
changeLenths() {
if (this._infoContainer.current) {
@@ -583,7 +545,7 @@ export class Timeline extends React.Component<FieldViewProps> {
<div key="timeline_scrubberhead" className="scrubberhead" onPointerDown={this.onScrubberDown} ></div>
</div>
<div key="timeline_trackbox" className="trackbox" ref={this._trackbox} onPointerDown={this.onPanDown} style={{ width: `${this._totalLength}px` }}>
- {DocListCast(this.children).map(doc => <Track node={doc} currentBarX={this._currentBarX} changeCurrentBarX={this.changeCurrentBarX} transform={this.props.ScreenToLocalTransform()} time={this._time} tickSpacing={this._tickSpacing} tickIncrement={this._tickIncrement} collection={this.props.Document} timelineVisible={this._timelineVisible} check={this._check} />)}
+ {DocListCast(this.children).map(doc => <Track node={doc} currentBarX={this._currentBarX} changeCurrentBarX={this.changeCurrentBarX} transform={this.props.ScreenToLocalTransform()} time={this._time} tickSpacing={this._tickSpacing} tickIncrement={this._tickIncrement} collection={this.props.Document} timelineVisible={this._timelineVisible}/>)}
</div>
</div>
<div key="timeline_title" className="title-container" ref={this._titleContainer}>
@@ -593,14 +555,6 @@ export class Timeline extends React.Component<FieldViewProps> {
<FontAwesomeIcon className="resize" icon={faGripLines} />
</div>
</div>
- <div key="timeline-checker" className="timeline-checker" style={{ top: `${this._containerHeight}px`, visibility: this._checkVisible ? "visible" : "hidden" }}>
- <div onClick={() => { this.onCheckClicked("yes"); }}>
- <FontAwesomeIcon style={{ color: "#42b883" }} className="check" icon={faCheckCircle} />
- </div>
- <div onClick={() => { this.onCheckClicked("no"); }}>
- <FontAwesomeIcon style={{ color: "#ff7e67" }} className="check" icon={faTimesCircle} />
- </div>
- </div>
</div>
{this.timelineToolBox(1)}
</div>
diff --git a/src/client/views/animationtimeline/Track.tsx b/src/client/views/animationtimeline/Track.tsx
index 40350bc7a..d260792e1 100644
--- a/src/client/views/animationtimeline/Track.tsx
+++ b/src/client/views/animationtimeline/Track.tsx
@@ -21,7 +21,6 @@ interface IProps {
tickIncrement: number;
tickSpacing: number;
timelineVisible: boolean;
- check: string;
changeCurrentBarX: (x: number) => void;
}
@@ -30,10 +29,6 @@ export class Track extends React.Component<IProps> {
@observable private _inner = React.createRef<HTMLDivElement>();
@observable private _currentBarXReaction: any;
@observable private _timelineVisibleReaction: any;
- @observable private _isOnKeyframe: boolean = false;
- @observable private _onKeyframe: (Doc | undefined) = undefined;
- @observable private _onRegionData: (Doc | undefined) = undefined;
- @observable private _storedState: (Doc | undefined) = undefined;
private readonly MAX_TITLE_HEIGHT = 75;
private _trackHeight = 0;
private whitelist = [