imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Merge pull request #2383 from matrix-org/travis/back-button"

Browse source 
This reverts commit 78592286bd.
This commit is contained in:
Travis Ralston 2019-01-03 14:37:04 -07:00
parent 78592286bd
commit 0978687c65
5 changed files with 11 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -927,10 +927,6 @@ export default React.createClass({
},
_viewHome: function() {
// The home page requires the "logged in" view, so we'll set that.
this.setStateForNewView({
view: VIEWS.LOGGED_IN,
});
this._setPage(PageTypes.HomePage);
this.notifyNewScreen('home');
},
@ -1187,7 +1183,10 @@ export default React.createClass({
* @param {string} teamToken
*/
_onLoggedIn: async function(teamToken) {
this.setStateForNewView({view: VIEWS.LOGGED_IN});
this.setState({
view: VIEWS.LOGGED_IN,
});
if (teamToken) {
// A team member has logged in, not a guest
this._teamToken = teamToken;