matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-20 16:22:28 +03:00
Code Activity

s/quote_event/reply_to_event/

Browse Source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski
2018-02-19 23:41:07 +00:00
parent 6510989ac6
commit 34b427d15e
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/views/rooms/MessageComposerInput.js
View File

@@ -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) {

2
src/components/views/rooms/ReplyPreview.js
View File

@@ -23,7 +23,7 @@ import SettingsStore from "../../../settings/SettingsStore";
function cancelQuoting() {
dis.dispatch({
action: 'quote_event',
action: 'reply_to_event',
event: null,
});
}