matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-28 15:22:05 +03:00
Code Activity

Merge pull request #2219 from matrix-org/travis/login-register-composer

Browse Source 
Move the login box from the left sidebar to where the composer is
This commit is contained in:
David Baker
2018-10-22 13:05:19 +01:00
committed by GitHub
parent 8532828b46 94aac62f25
commit b8153dcec7
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

@ -1670,7 +1670,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 =
@ -1684,6 +1684,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) {