mirror of https://github.com/vector-im/riot-web
s/quote_event/reply_to_event/
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>pull/21833/head
parent
6510989ac6
commit
34b427d15e
|
@ -275,7 +275,7 @@ export default class MessageComposerInput extends React.Component {
|
|||
let contentState = this.state.editorState.getCurrentContent();
|
||||
|
||||
switch (payload.action) {
|
||||
case 'quote_event':
|
||||
case 'reply_to_event':
|
||||
case 'focus_composer':
|
||||
editor.focus();
|
||||
break;
|
||||
|
@ -838,14 +838,7 @@ export default class MessageComposerInput extends React.Component {
|
|||
sendTextFn = ContentHelpers.makeEmoteMessage;
|
||||
}
|
||||
|
||||
const quotingEv = RoomViewStore.getQuotingEvent();
|
||||
const content = quotingEv ? Reply.getRelationship(quotingEv) : {};
|
||||
// we have finished quoting, clear the quotingEvent
|
||||
// TODO maybe delay this until the event actually sends?
|
||||
dis.dispatch({
|
||||
action: 'quote_event',
|
||||
event: null,
|
||||
});
|
||||
const content = Reply.getMRelatesTo(RoomViewStore.getQuotingEvent());
|
||||
|
||||
let sendMessagePromise;
|
||||
if (contentHTML) {
|
||||
|
|
|
@ -23,7 +23,7 @@ import SettingsStore from "../../../settings/SettingsStore";
|
|||
|
||||
function cancelQuoting() {
|
||||
dis.dispatch({
|
||||
action: 'quote_event',
|
||||
action: 'reply_to_event',
|
||||
event: null,
|
||||
});
|
||||
}
|
||||
|
|
|
@ -111,10 +111,16 @@ class RoomViewStore extends Store {
|
|||
forwardingEvent: payload.event,
|
||||
});
|
||||
break;
|
||||
case 'quote_event':
|
||||
case 'reply_to_event':
|
||||
this._setState({
|
||||
quotingEvent: payload.event,
|
||||
replyingToEvent: payload.event,
|
||||
});
|
||||
break;
|
||||
case 'message_sent':
|
||||
this._setState({
|
||||
replyingToEvent: null,
|
||||
});
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -132,8 +138,8 @@ class RoomViewStore extends Store {
|
|||
shouldPeek: payload.should_peek === undefined ? true : payload.should_peek,
|
||||
// have we sent a join request for this room and are waiting for a response?
|
||||
joining: payload.joining || false,
|
||||
// Reset quotingEvent because we don't want cross-room because bad UX
|
||||
quotingEvent: null,
|
||||
// Reset replyingToEvent because we don't want cross-room because bad UX
|
||||
replyingToEvent: null,
|
||||
};
|
||||
|
||||
if (this._state.forwardingEvent) {
|
||||
|
@ -297,7 +303,7 @@ class RoomViewStore extends Store {
|
|||
|
||||
// The mxEvent if one is currently being replied to/quoted
|
||||
getQuotingEvent() {
|
||||
return this._state.quotingEvent;
|
||||
return this._state.replyingToEvent;
|
||||
}
|
||||
|
||||
shouldPeek() {
|
||||
|
|
Loading…
Reference in New Issue