Merge remote-tracking branch 'origin/develop' into develop

pull/21833/head
Weblate 2018-01-03 15:48:49 +00:00
commit 58e773031b
1 changed files with 2 additions and 1 deletions

View File

@ -512,7 +512,8 @@ export default class MessageComposerInput extends React.Component {
// composer. For some reason the editor won't scroll automatically if we paste // composer. For some reason the editor won't scroll automatically if we paste
// blocks of text in or insert newlines. // blocks of text in or insert newlines.
if (textContent.slice(selection.start).indexOf("\n") === -1) { if (textContent.slice(selection.start).indexOf("\n") === -1) {
this.refs.editor.refs.editor.scrollTop = this.refs.editor.refs.editor.scrollHeight; let editorRoot = this.refs.editor.refs.editor.parentNode.parentNode;
editorRoot.scrollTop = editorRoot.scrollHeight;
} }
}); });
} }