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

Merge branch 'new-guest-access' of github.com:matrix-org/matrix-react-sdk into new-guest-access

Browse source
This commit is contained in:
Luke Barnard 2017-05-30 16:11:11 +01:00
commit b51f5ac6d1
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -685,7 +685,7 @@ module.exports = React.createClass({
onLoginClick: (ev) => { onLoginClick: (ev) => {
dis.dispatch({action: 'start_login'}); dis.dispatch({action: 'start_login'});
close(); close();
}, },
}).close; }).close;
}, },
@ -991,6 +991,11 @@ module.exports = React.createClass({
dis.dispatch({ dis.dispatch({
action: 'view_home_page', action: 'view_home_page',
}); });
} else if (screen == 'start') {
this.showScreen('home');
dis.dispatch({
action: 'view_set_mxid',
});
} else if (screen == 'directory') { } else if (screen == 'directory') {
dis.dispatch({ dis.dispatch({
action: 'view_room_directory', action: 'view_room_directory',