Intro - Fixed Some Bugs
Fixed top arrow fading when changing topics Fixed bug where intro is empty when clicking too fast
This commit is contained in:
parent
88056056eb
commit
f3db0d2c29
|
|
@ -17,6 +17,7 @@ class Intro extends React.Component {
|
||||||
prevLoc: -1,
|
prevLoc: -1,
|
||||||
currLoc: 0,
|
currLoc: 0,
|
||||||
nextLoc: 1,
|
nextLoc: 1,
|
||||||
|
moving: false,
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -43,11 +44,12 @@ class Intro extends React.Component {
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// Up Arrow
|
// Up Arrow
|
||||||
if (input === "up" && this.state.currLoc > 0) {
|
if (input === "up" && !this.state.moving && this.state.currLoc > 0 ) {
|
||||||
|
|
||||||
// Activate animation going to next topic
|
// Activate animation going to next topic
|
||||||
this.setState({
|
this.setState({
|
||||||
prev: 'current top',
|
prev: 'current top',
|
||||||
|
moving: true
|
||||||
});
|
});
|
||||||
|
|
||||||
// Wait 900 ms until the transition is finished
|
// Wait 900 ms until the transition is finished
|
||||||
|
|
@ -67,16 +69,18 @@ class Intro extends React.Component {
|
||||||
this.setState({ // remove notrans from each div
|
this.setState({ // remove notrans from each div
|
||||||
prev: 'previous',
|
prev: 'previous',
|
||||||
prevLoc: prevloc,
|
prevLoc: prevloc,
|
||||||
|
moving: false,
|
||||||
});
|
});
|
||||||
|
|
||||||
}, 75);
|
}, 75);
|
||||||
|
|
||||||
}, 900);
|
}, 900);
|
||||||
} else if (input === "down" && this.state.nextLoc < this.topics.length) {
|
} else if (input === "down" && !this.state.moving && this.state.nextLoc < this.topics.length) {
|
||||||
// Activate transition going to previous topic
|
// Activate transition going to previous topic
|
||||||
this.setState({
|
this.setState({
|
||||||
//curr: 'previous',
|
//curr: 'previous',
|
||||||
next: 'current'
|
next: 'current',
|
||||||
|
moving: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
// wait 900 ms before placing all topics into correct divs
|
// wait 900 ms before placing all topics into correct divs
|
||||||
|
|
@ -96,6 +100,7 @@ class Intro extends React.Component {
|
||||||
this.setState({
|
this.setState({
|
||||||
next: 'next',
|
next: 'next',
|
||||||
nextLoc: nextloc,
|
nextLoc: nextloc,
|
||||||
|
moving: false,
|
||||||
});
|
});
|
||||||
}, 75);
|
}, 75);
|
||||||
}, 900);
|
}, 900);
|
||||||
|
|
|
||||||
|
|
@ -56,7 +56,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.intro .top {
|
.intro .top {
|
||||||
z-index: 11 !important;
|
z-index: 11;
|
||||||
}
|
}
|
||||||
|
|
||||||
.notrans {
|
.notrans {
|
||||||
|
|
@ -96,4 +96,8 @@
|
||||||
|
|
||||||
.intro .navbutton.bottom {
|
.intro .navbutton.bottom {
|
||||||
margin-top: auto;
|
margin-top: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.intro .navbutton.top {
|
||||||
|
z-index: 14;
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue