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

Move init logic into componentWillMount 

to simplify getInitialState
pull/21833/head
David Baker 2016-06-14 14:38:45 +01:00
parent 0ef5cc891e
commit a95d8b5ed6
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/components/structures/RoomView.js
View File

@ -102,23 +102,17 @@ module.exports = React.createClass({
},
getInitialState: function() {
var room;
var room_id;
if (this.props.roomAddress[0] == '!') {
room_id = this.props.roomAddress;
room = MatrixClientPeg.get().getRoom(room_id);
}
return {
room: room,
roomId: room_id,
roomLoading: !room,
room: null,
roomId: null,
roomLoading: true,
editingRoomSettings: false,
uploadingRoomSettings: false,
numUnreadMessages: 0,
draggingFile: false,
searching: false,
searchResults: null,
hasUnsentMessages: this._hasUnsentMessages(room),
hasUnsentMessages: false,
callState: null,
guestsCanJoin: false,
canPeek: false,
@ -164,15 +158,22 @@ module.exports = React.createClass({
room: room,
roomId: result.room_id,
roomLoading: !room,
hasUnsentMessages: this._hasUnsentMessages(room),
}, this.updatePeeking);
}, (err) => {
this.setState({
roomLoading: false,
});
});
} else {
var room = MatrixClientPeg.get().getRoom(this.props.roomAddress);
this.setState({
roomId: this.props.roomAddress,
room: room,
roomLoading: !room,
hasUnsentMessages: this._hasUnsentMessages(room),
}, this.updatePeeking);
}
this.updatePeeking();
},
updatePeeking: function() {