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

Move the login box from the left sidebar to where the composer is

Browse source 
Fixes https://github.com/vector-im/riot-web/issues/4227

This includes removing the collapse button that isn't needed anymore.
This commit is contained in:
Travis Ralston 2018-10-15 14:26:02 -06:00
parent 0912b8dcc2
commit 94aac62f25
4 changed files with 22 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1669,7 +1669,7 @@ module.exports = React.createClass({
let messageComposer, searchInfo;
const canSpeak = (
// joined and not showing search results
myMembership == 'join' && !this.state.searchResults
myMembership === 'join' && !this.state.searchResults
);
if (canSpeak) {
messageComposer =
@ -1683,6 +1683,11 @@ module.exports = React.createClass({
/>;
}
if (MatrixClientPeg.get().isGuest()) {
const LoginBox = sdk.getComponent('structures.LoginBox');
messageComposer = <LoginBox/>;
}
// TODO: Why aren't we storing the term/scope/count in this format
// in this.state if this is what RoomHeader desires?
if (this.state.searchResults) {