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

cancel pending edit when sending new edit

Browse source
This commit is contained in:
Bruno Windels 2019-07-02 14:52:29 +02:00
parent d0d327620b
commit 357ad3d50c
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/components/views/elements/MessageEditor.js
View file

@ -31,6 +31,7 @@ import {renderModel} from '../../../editor/render';
import EditorStateTransfer from '../../../utils/EditorStateTransfer'; import EditorStateTransfer from '../../../utils/EditorStateTransfer';
import {MatrixClient} from 'matrix-js-sdk'; import {MatrixClient} from 'matrix-js-sdk';
import classNames from 'classnames'; import classNames from 'classnames';
import {EventStatus} from 'matrix-js-sdk';
export default class MessageEditor extends React.Component { export default class MessageEditor extends React.Component {
static propTypes = { static propTypes = {
@ -195,12 +196,21 @@ export default class MessageEditor extends React.Component {
}, contentBody); }, contentBody);
const roomId = this.props.editState.getEvent().getRoomId(); const roomId = this.props.editState.getEvent().getRoomId();
this._cancelPreviousPendingEdit();
this.context.matrixClient.sendMessage(roomId, content); this.context.matrixClient.sendMessage(roomId, content);
dis.dispatch({action: "edit_event", event: null}); dis.dispatch({action: "edit_event", event: null});
dis.dispatch({action: 'focus_composer'}); dis.dispatch({action: 'focus_composer'});
} }
_cancelPreviousPendingEdit() {
const originalEvent = this.props.editState.getEvent();
const previousEdit = originalEvent.replacingEvent();
if (previousEdit.status === EventStatus.QUEUED || previousEdit.status === EventStatus.NOT_SENT) {
this.context.matrixClient.cancelPendingEvent(previousEdit);
}
}
_onAutoCompleteConfirm = (completion) => { _onAutoCompleteConfirm = (completion) => {
this.model.autoComplete.onComponentConfirm(completion); this.model.autoComplete.onComponentConfirm(completion);
} }