handle room invites

This commit is contained in:
David Baker 2015-06-22 14:48:58 +01:00
parent 2ba4ad04d1
commit c425886a45
5 changed files with 88 additions and 20 deletions

View file

@ -27,6 +27,10 @@
background-color: #66e; background-color: #66e;
} }
.mx_RoomTile.invited {
background-color: #6e6;
}
.mx_RoomTile:hover { .mx_RoomTile:hover {
background-color: #ff8; background-color: #ff8;
} }

View file

@ -24,6 +24,17 @@
list-style-type: none; list-style-type: none;
} }
.mx_RoomView .mx_RoomView_invitePrompt {
text-align: center;
background-color: #ddd;
border: 1px solid black;
width: 400px;
margin-left: auto;
margin-right: auto;
margin-top: 200px;
padding: 50px;
}
.mx_RoomView .mx_MemberList { .mx_RoomView .mx_MemberList {
position: absolute; position: absolute;
top: 35px; top: 35px;

View file

@ -26,23 +26,44 @@ module.exports = {
onRoomTimeline: function(ev, room, toStartOfTimeline) { onRoomTimeline: function(ev, room, toStartOfTimeline) {
if (room.roomId != this.props.roomId) return; if (room.roomId != this.props.roomId) return;
if (this.refs.messageList) {
var messageUl = this.refs.messageList.getDOMNode(); var messageUl = this.refs.messageList.getDOMNode();
this.atBottom = messageUl.scrollHeight - messageUl.scrollTop <= messageUl.clientHeight; this.atBottom = messageUl.scrollHeight - messageUl.scrollTop <= messageUl.clientHeight;
}
this.setState({ this.setState({
room: MatrixClientPeg.get().getRoom(this.props.roomId) room: MatrixClientPeg.get().getRoom(this.props.roomId)
}); });
}, },
componentDidMount: function() { componentDidMount: function() {
if (this.refs.messageList) {
var messageUl = this.refs.messageList.getDOMNode(); var messageUl = this.refs.messageList.getDOMNode();
messageUl.scrollTop = messageUl.scrollHeight; messageUl.scrollTop = messageUl.scrollHeight;
}
}, },
componentDidUpdate: function() { componentDidUpdate: function() {
if (this.atBottom) { if (this.refs.messageList && this.atBottom) {
var messageUl = this.refs.messageList.getDOMNode(); var messageUl = this.refs.messageList.getDOMNode();
messageUl.scrollTop = messageUl.scrollHeight; messageUl.scrollTop = messageUl.scrollHeight;
} }
},
onJoinButtonClicked: function(ev) {
MatrixClientPeg.get().joinRoom(this.props.roomId).then(function() {
this.setState({
joining: undefined
});
}, function(error) {
this.setState({
joining: undefined,
joinError: error
});
});
this.setState({
joining: true
});
} }
}; };

View file

@ -3,14 +3,18 @@ var classNames = require('classnames');
var RoomTileController = require("../../controllers/molecules/RoomTile"); var RoomTileController = require("../../controllers/molecules/RoomTile");
var MatrixClientPeg = require("../../MatrixClientPeg");
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'RoomTile', displayName: 'RoomTile',
mixins: [RoomTileController], mixins: [RoomTileController],
render: function() { render: function() {
var myUserId = MatrixClientPeg.get().credentials.userId;
var classes = classNames({ var classes = classNames({
'mx_RoomTile': true, 'mx_RoomTile': true,
'selected': this.props.selected, 'selected': this.props.selected,
'unread': this.props.unread 'unread': this.props.unread,
'invited': this.props.room.currentState.members[myUserId].membership == 'invite'
}); });
return ( return (
<div className={classes} onClick={this.onClick}> <div className={classes} onClick={this.onClick}>

View file

@ -1,5 +1,7 @@
var React = require('react'); var React = require('react');
var MatrixClientPeg = require("../../MatrixClientPeg");
var ComponentBroker = require('../../ComponentBroker'); var ComponentBroker = require('../../ComponentBroker');
var MessageTile = ComponentBroker.get('molecules/MessageTile'); var MessageTile = ComponentBroker.get('molecules/MessageTile');
@ -9,6 +11,8 @@ var MessageComposer = ComponentBroker.get('molecules/MessageComposer');
var RoomViewController = require("../../controllers/organisms/RoomView"); var RoomViewController = require("../../controllers/organisms/RoomView");
var Loader = require("react-loader");
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'RoomView', displayName: 'RoomView',
@ -23,6 +27,29 @@ module.exports = React.createClass({
}, },
render: function() { render: function() {
var myUserId = MatrixClientPeg.get().credentials.userId;
if (this.state.room.currentState.members[myUserId].membership == 'invite') {
if (this.state.joining) {
return (
<div className="mx_RoomView">
<Loader />
</div>
);
} else {
var inviteEvent = this.state.room.currentState.members[myUserId].events.member.event;
// XXX: Leaving this intentionally basic for now because invites are about to change totally
var joinErrorText = this.state.joinError ? "Failed to join room!" : "";
return (
<div className="mx_RoomView">
<div className="mx_RoomView_invitePrompt">
<div>{inviteEvent.user_id} has invited you to a room</div>
<button ref="joinButton" onClick={this.onJoinButtonClicked}>Join</button>
<div className="error">{joinErrorText}</div>
</div>
</div>
);
}
} else {
return ( return (
<div className="mx_RoomView"> <div className="mx_RoomView">
<RoomHeader room={this.state.room} /> <RoomHeader room={this.state.room} />
@ -35,6 +62,7 @@ module.exports = React.createClass({
<MessageComposer roomId={this.props.roomId} /> <MessageComposer roomId={this.props.roomId} />
</div> </div>
); );
}
}, },
}); });