PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #571 from matrix-org/dbkr/fix_login_crash

Browse source 
Fix crash on logging in
This commit is contained in:
David Baker 2016-11-24 15:10:40 +00:00 committed by GitHub
commit 56f224e513
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/structures/MatrixChat.js
View file

@ -75,6 +75,9 @@ module.exports = React.createClass({
loading: true, loading: true,
screen: undefined, screen: undefined,
// What the LoggedInView would be showing if visible
page_type: PageTypes.RoomDirectory,
// If we are viewing a room by alias, this contains the alias // If we are viewing a room by alias, this contains the alias
currentRoomAlias: null, currentRoomAlias: null,
@ -235,8 +238,6 @@ module.exports = React.createClass({
setStateForNewScreen: function(state) { setStateForNewScreen: function(state) {
const newState = { const newState = {
screen: undefined, screen: undefined,
currentRoomAlias: null,
currentRoomId: null,
viewUserId: null, viewUserId: null,
logged_in: false, logged_in: false,
ready: false, ready: false,
@ -597,6 +598,9 @@ module.exports = React.createClass({
ready: false, ready: false,
collapse_lhs: false, collapse_lhs: false,
collapse_rhs: false, collapse_rhs: false,
currentRoomAlias: null,
currentRoomId: null,
page_type: PageTypes.RoomDirectory,
}); });
}, },