Merge pull request #4038 from vector-im/tom-welcome-page

Tom welcome page
This commit is contained in:
Matthew Hodgson 2017-05-30 21:36:21 +01:00 committed by GitHub
commit 64a67583e0
33 changed files with 584 additions and 45 deletions

View file

@ -104,10 +104,6 @@ module.exports = React.createClass({
});
},
onLoginClick: function() {
dis.dispatch({ action: 'start_login' });
},
onRoomStateMember: function(ev, state, member) {
// redraw the badge on the membership list
if (this.state.phase == this.Phase.MemberList && member.roomId === this.props.roomId) {
@ -225,10 +221,6 @@ module.exports = React.createClass({
<TintableSvg src="img/minimise.svg" width="10" height="16"/>
</div>
</div>;
} else if (MatrixClientPeg.get().isGuest()) {
buttonGroup = <AccessibleButton className="mx_RightPanel_loginButton" element="button" onClick={this.onLoginClick}>
Login
</AccessibleButton>;
}
if (!this.props.collapsed) {