Merge pull request #3183 from matrix-org/t3chguy/editing_while_replying

Don't allow editing via up-arrow when Replying
This commit is contained in:
Michael Telatynski 2019-07-06 08:53:22 +01:00 committed by GitHub
commit 040e580cf0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1143,7 +1143,7 @@ export default class MessageComposerInput extends React.Component {
const editingEnabled = SettingsStore.isFeatureEnabled("feature_message_editing"); const editingEnabled = SettingsStore.isFeatureEnabled("feature_message_editing");
const shouldSelectHistory = (editingEnabled && e.altKey) || !editingEnabled; const shouldSelectHistory = (editingEnabled && e.altKey) || !editingEnabled;
const shouldEditLastMessage = editingEnabled && !e.altKey && up; const shouldEditLastMessage = editingEnabled && !e.altKey && up && !RoomViewStore.getQuotingEvent();
if (shouldSelectHistory) { if (shouldSelectHistory) {
// Try select composer history // Try select composer history