pro/im_webapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge master

Browse Source
This commit is contained in:
or-else
2025-09-05 16:36:03 +03:00
parent 6e04638441 1dc5ea1655
commit ed6be52228
6 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/contact.jsx
+6 -1
View File
@@ -46,7 +46,12 @@ class Contact extends React.Component {
handleContextClick(e) {
e.preventDefault();
e.stopPropagation();
this.props.showContextMenu({ topicName: this.props.item, y: e.pageY, x: e.pageX });
this.props.showContextMenu({
topicName: this.props.item,
topicTitle: this.props.title,
y: e.pageY,
x: e.pageX
});
}
render() {
src/widgets/context-menu.jsx
+4 -4
View File
@@ -152,7 +152,7 @@ class ContextMenu extends React.Component {
title: formatMessage(messages.clear_messages),
handler: (params, errorHandler) => {
return props.onShowAlert(
formatMessage(messages.clear_messages), // title
params.topicTitle || formatMessage(messages.clear_messages), // title
formatMessage(messages.clear_messages_warning), // content
(_ => { this.deleteMessages(true, false, params, errorHandler); }), // onConfirm
null, // "OK"
@@ -166,7 +166,7 @@ class ContextMenu extends React.Component {
title: formatMessage(messages.clear_for_all),
handler: (params, errorHandler) => {
return props.onShowAlert(
formatMessage(messages.clear_for_all), // title
params.topicTitle || formatMessage(messages.clear_for_all), // title
formatMessage(messages.delete_messages_warning), // content
(_ => { return this.deleteMessages(true, true, params, errorHandler); }),
null, // "OK"
@@ -257,7 +257,7 @@ class ContextMenu extends React.Component {
title: formatMessage(messages.block),
handler: (params, errorHandler) => {
return props.onShowAlert(
formatMessage(messages.block), // title
params.topicTitle || formatMessage(messages.block), // title
formatMessage(messages.topic_block_warning), // content
(_ => this.topicPermissionSetter('-JP', params, errorHandler).then(ctrl => {
this.props.onTopicRemoved(params.topicName);
@@ -274,7 +274,7 @@ class ContextMenu extends React.Component {
title: formatMessage(messages.topic_delete),
handler: (params, errorHandler) => {
return props.onShowAlert(
formatMessage(messages.topic_delete), // title
params.topicTitle || formatMessage(messages.topic_delete), // title
formatMessage(messages.topic_delete_warning), // content
(_ => {
const topic = this.props.tinode.getTopic(params.topicName);