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

Merge branch 'develop' into fix-4963

Browse source
This commit is contained in:
Šimon Brandner 2021-02-12 16:30:01 +01:00
commit 2b4859a858
No known key found for this signature in database
GPG key ID: 9760693FDD98A790
212 changed files with 16211 additions and 6050 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -157,13 +157,14 @@ export default class SendMessageComposer extends React.Component {
this.onVerticalArrow(event, true);
} else if (event.key === Key.ARROW_DOWN) {
this.onVerticalArrow(event, false);
} else if (this._prepareToEncrypt) {
this._prepareToEncrypt();
} else if (event.key === Key.ESCAPE) {
dis.dispatch({
action: 'reply_to_event',
event: null,
});
} else if (this._prepareToEncrypt) {
// This needs to be last!
this._prepareToEncrypt();
}
};
@ -403,6 +404,7 @@ export default class SendMessageComposer extends React.Component {
this._editorRef.clearUndoHistory();
this._editorRef.focus();
this._clearStoredEditorState();
dis.dispatch({action: "scroll_to_bottom"});
}
componentWillUnmount() {