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

put dispatches together

Browse source
This commit is contained in:
Bruno Windels 2019-08-20 13:56:11 +02:00
parent 2e71dd3ea8
commit 9003a8836a
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,13 +41,6 @@ function addReplyToMessageContent(content, repliedToEvent, permalinkCreator) {
} }
content.body = nestedReply.body + content.body; content.body = nestedReply.body + content.body;
} }
// Clear reply_to_event as we put the message into the queue
// if the send fails, retry will handle resending.
dis.dispatch({
action: 'reply_to_event',
event: null,
});
} }
function createMessageContent(model, permalinkCreator) { function createMessageContent(model, permalinkCreator) {
@ -103,9 +96,18 @@ export default class SendMessageComposer extends React.Component {
} }
_sendMessage() { _sendMessage() {
const isReply = !!RoomViewStore.getQuotingEvent();
const {roomId} = this.props.room; const {roomId} = this.props.room;
this.context.matrixClient.sendMessage(roomId, createMessageContent(this.model, this.props.permalinkCreator)); this.context.matrixClient.sendMessage(roomId, createMessageContent(this.model, this.props.permalinkCreator));
this.model.reset([]); this.model.reset([]);
if (isReply) {
// Clear reply_to_event as we put the message into the queue
// if the send fails, retry will handle resending.
dis.dispatch({
action: 'reply_to_event',
event: null,
});
}
dis.dispatch({action: 'focus_composer'}); dis.dispatch({action: 'focus_composer'});
} }