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

Merge pull request #6960 from matrix-org/gsouquet/rename-replythread

Browse source
This commit is contained in:
Germain 2021-10-18 17:11:31 +01:00 • committed by GitHub
commit 77e6e1c0ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 77 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/components/views/context_menus/MessageContextMenu.tsx
View file

@ -61,7 +61,7 @@ interface IProps extends IPosition {
eventTileOps?: IEventTileOps;
permalinkCreator?: RoomPermalinkCreator;
/* an optional function to be called when the user clicks collapse thread, if not provided hide button */
collapseReplyThread?(): void;
collapseReplyChain?(): void;
/* callback called when the menu is dismissed */
onFinished(): void;
/* if the menu is inside a dialog, we sometimes need to close that dialog after click (forwarding) */
@ -206,8 +206,8 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
this.closeMenu();
};
private onCollapseReplyThreadClick = (): void => {
this.props.collapseReplyThread();
private onCollapseReplyChainClick = (): void => {
this.props.collapseReplyChain();
this.closeMenu();
};
@ -253,7 +253,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
let unhidePreviewButton: JSX.Element;
let externalURLButton: JSX.Element;
let quoteButton: JSX.Element;
let collapseReplyThread: JSX.Element;
let collapseReplyChain: JSX.Element;
let redactItemList: JSX.Element;
// status is SENT before remote-echo, null after
@ -373,12 +373,12 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
);
}
if (this.props.collapseReplyThread) {
collapseReplyThread = (
if (this.props.collapseReplyChain) {
collapseReplyChain = (
<IconizedContextMenuOption
iconClassName="mx_MessageContextMenu_iconCollapse"
label={_t("Collapse reply thread")}
onClick={this.onCollapseReplyThreadClick}
onClick={this.onCollapseReplyChainClick}
/>
);
}
@ -417,7 +417,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
{ unhidePreviewButton }
{ viewSourceButton }
{ resendReactionsButton }
{ collapseReplyThread }
{ collapseReplyChain }
</IconizedContextMenuOptionList>
);