Allow quote-reply in thread view element-web (#6959)
This commit is contained in:
parent
d39002338d
commit
694ec946e2
11 changed files with 84 additions and 88 deletions
|
@ -32,6 +32,7 @@ import { retry } from "../utils/promise";
|
|||
import CountlyAnalytics from "../CountlyAnalytics";
|
||||
|
||||
import { logger } from "matrix-js-sdk/src/logger";
|
||||
import { TimelineRenderingType } from "../contexts/RoomContext";
|
||||
|
||||
const NUM_JOIN_RETRY = 5;
|
||||
|
||||
|
@ -153,16 +154,19 @@ class RoomViewStore extends Store<ActionPayload> {
|
|||
case 'reply_to_event':
|
||||
// If currently viewed room does not match the room in which we wish to reply then change rooms
|
||||
// this can happen when performing a search across all rooms
|
||||
if (payload.event && payload.event.getRoomId() !== this.state.roomId) {
|
||||
dis.dispatch({
|
||||
action: 'view_room',
|
||||
room_id: payload.event.getRoomId(),
|
||||
replyingToEvent: payload.event,
|
||||
});
|
||||
} else {
|
||||
this.setState({
|
||||
replyingToEvent: payload.event,
|
||||
});
|
||||
if (payload.context === TimelineRenderingType.Room) {
|
||||
if (payload.event
|
||||
&& payload.event.getRoomId() !== this.state.roomId) {
|
||||
dis.dispatch({
|
||||
action: 'view_room',
|
||||
room_id: payload.event.getRoomId(),
|
||||
replyingToEvent: payload.event,
|
||||
});
|
||||
} else {
|
||||
this.setState({
|
||||
replyingToEvent: payload.event,
|
||||
});
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 'open_room_settings': {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue