OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

simplify logic 

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/21833/head
Michael Telatynski 2018-04-29 00:48:44 +01:00
parent bbf4d3e39f
commit 5bb15b1002
No known key found for this signature in database
GPG Key ID: 3F879DA5AD802A5E
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/components/views/elements/ReplyThread.js
View File

@ -83,13 +83,8 @@ export default class ReplyThread extends React.Component {
async initialize() {
const {parentEv} = this.props;
const inReplyTo = ReplyThread.getParentEventId(parentEv);
if (!inReplyTo) {
this.setState({err: true});
return;
}
const ev = await ReplyThread.getEvent(this.room, inReplyTo['event_id']);
// at time of making this component we checked that props.parentEv has a parentEventId
const ev = await ReplyThread.getEvent(this.room, ReplyThread.getParentEventId(parentEv));
if (this.unmounted) return;
if (ev) {
@ -104,16 +99,16 @@ export default class ReplyThread extends React.Component {
async loadNextEvent() {
if (this.unmounted) return;
const ev = this.state.events[0];
const inReplyTo = ReplyThread.getParentEventId(ev);
const inReplyToEventId = ReplyThread.getParentEventId(ev);
if (!inReplyTo) {
if (!inReplyToEventId) {
this.setState({
loading: false,
});
return;
}
const loadedEv = await ReplyThread.getEvent(this.room, inReplyTo['event_id']);
const loadedEv = await ReplyThread.getEvent(this.room, inReplyToEventId);
if (this.unmounted) return;
if (loadedEv) {