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

Merge branch 'master' of github.com:vector-im/vector-web into leave_room_button

Browse source
This commit is contained in:
Erik Johnston 2015-07-22 13:30:34 +01:00
commit b9fd174f72
2 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/controllers/organisms/RoomView.js
View file

@ -89,6 +89,17 @@ module.exports = {
case 'notifier_enabled':
this.forceUpdate();
break;
case 'call_state':
if (this.props.roomId !== payload.room_id) {
break;
}
// scroll to bottom
var messageWrapper = this.refs.messageWrapper;
if (messageWrapper) {
messageWrapper = messageWrapper.getDOMNode();
messageWrapper.scrollTop = messageWrapper.scrollHeight;
}
break;
}
},
@ -114,7 +125,10 @@ module.exports = {
if (this.refs.messageWrapper) {
var messageWrapper = this.refs.messageWrapper.getDOMNode();
this.atBottom = messageWrapper.scrollHeight - messageWrapper.scrollTop <= messageWrapper.clientHeight;
this.atBottom = (
messageWrapper.scrollHeight - messageWrapper.scrollTop <=
(messageWrapper.clientHeight + 150)
);
}
this.setState({
room: MatrixClientPeg.get().getRoom(this.props.roomId)