mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-25 20:26:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Weblate 2018-06-14 08:45:24 +00:00
commit 438dd00fe7
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/views/rooms/MessageComposerInput.js
View file

@ -244,12 +244,14 @@ export default class MessageComposerInput extends React.Component {
let editorState = null;
if (contentState) {
editorState = EditorState.createWithContent(contentState, compositeDecorator);
editorState = EditorState.moveFocusToEnd(
EditorState.createWithContent(contentState, compositeDecorator)
);
} else {
editorState = EditorState.createEmpty(compositeDecorator);
}
return EditorState.moveFocusToEnd(editorState);
return editorState;
}
componentDidMount() {