gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Erik Johnston 2015-07-22 13:30:34 +01:00
parent 6bfc566d9a d4147c1315
commit b9fd174f72
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/controllers/molecules/MessageComposer.js
View File

@ -153,7 +153,12 @@ module.exports = {
onKeyDown: function (ev) {
if (ev.keyCode === KeyCode.ENTER) {
this.sentHistory.push(this.refs.textarea.getDOMNode().value);
var input = this.refs.textarea.getDOMNode().value;
if (input.length === 0) {
ev.preventDefault();
return;
}
this.sentHistory.push(input);
this.onEnter(ev);
}
else if (ev.keyCode === KeyCode.TAB) {

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)