OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Use key binding for cancelling a message reply

pull/21833/head
Clemens Zeidler 2021-02-16 19:12:18 +13:00
parent ac7963b509
commit c84ad9bedc
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/KeyBindingsManager.ts
View File

@ -22,7 +22,7 @@ export enum KeyAction {
/** Start editing the user's next sent message */ /** Start editing the user's next sent message */
EditNextMessage = 'EditNextMessage', EditNextMessage = 'EditNextMessage',
/** Cancel editing a message */ /** Cancel editing a message or cancel replying to a message */
CancelEditing = 'CancelEditing', CancelEditing = 'CancelEditing',
} }

14
src/components/views/rooms/SendMessageComposer.js
View File

@ -38,7 +38,6 @@ import * as sdk from '../../../index';
import Modal from '../../../Modal'; import Modal from '../../../Modal';
import {_t, _td} from '../../../languageHandler'; import {_t, _td} from '../../../languageHandler';
import ContentMessages from '../../../ContentMessages'; import ContentMessages from '../../../ContentMessages';
import {Key} from "../../../Keyboard";
import MatrixClientContext from "../../../contexts/MatrixClientContext"; import MatrixClientContext from "../../../contexts/MatrixClientContext";
import RateLimitedFunc from '../../../ratelimitedfunc'; import RateLimitedFunc from '../../../ratelimitedfunc';
import {Action} from "../../../dispatcher/actions"; import {Action} from "../../../dispatcher/actions";
@ -174,13 +173,14 @@ export default class SendMessageComposer extends React.Component {
} }
} }
break; break;
case KeyAction.CancelEditing:
dis.dispatch({
action: 'reply_to_event',
event: null,
});
break;
default: default:
if (event.key === Key.ESCAPE) { if (this._prepareToEncrypt) {
dis.dispatch({
action: 'reply_to_event',
event: null,
});
} else if (this._prepareToEncrypt) {
// This needs to be last! // This needs to be last!
this._prepareToEncrypt(); this._prepareToEncrypt();
} }