ux improvemnt: use contact name as title in alert dialog
This commit is contained in:
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "tinode-webapp",
|
"name": "tinode-webapp",
|
||||||
"description": "Tinode messenger for the web",
|
"description": "Tinode messenger for the web",
|
||||||
"version": "0.24.3",
|
"version": "0.24.4",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "git+https://github.com/tinode/webapp.git"
|
"url": "git+https://github.com/tinode/webapp.git"
|
||||||
|
|||||||
+1
-1
@@ -1,3 +1,3 @@
|
|||||||
// This is a generated file. Don't edit.
|
// This is a generated file. Don't edit.
|
||||||
|
|
||||||
export const PACKAGE_VERSION = "0.24.3";
|
export const PACKAGE_VERSION = "0.24.4";
|
||||||
|
|||||||
@@ -46,7 +46,12 @@ class Contact extends React.Component {
|
|||||||
handleContextClick(e) {
|
handleContextClick(e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
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() {
|
render() {
|
||||||
|
|||||||
@@ -152,7 +152,7 @@ class ContextMenu extends React.Component {
|
|||||||
title: formatMessage(messages.clear_messages),
|
title: formatMessage(messages.clear_messages),
|
||||||
handler: (params, errorHandler) => {
|
handler: (params, errorHandler) => {
|
||||||
return props.onShowAlert(
|
return props.onShowAlert(
|
||||||
formatMessage(messages.clear_messages), // title
|
params.topicTitle || formatMessage(messages.clear_messages), // title
|
||||||
formatMessage(messages.clear_messages_warning), // content
|
formatMessage(messages.clear_messages_warning), // content
|
||||||
(_ => { this.deleteMessages(true, false, params, errorHandler); }), // onConfirm
|
(_ => { this.deleteMessages(true, false, params, errorHandler); }), // onConfirm
|
||||||
null, // "OK"
|
null, // "OK"
|
||||||
@@ -166,7 +166,7 @@ class ContextMenu extends React.Component {
|
|||||||
title: formatMessage(messages.clear_for_all),
|
title: formatMessage(messages.clear_for_all),
|
||||||
handler: (params, errorHandler) => {
|
handler: (params, errorHandler) => {
|
||||||
return props.onShowAlert(
|
return props.onShowAlert(
|
||||||
formatMessage(messages.clear_for_all), // title
|
params.topicTitle || formatMessage(messages.clear_for_all), // title
|
||||||
formatMessage(messages.delete_messages_warning), // content
|
formatMessage(messages.delete_messages_warning), // content
|
||||||
(_ => { return this.deleteMessages(true, true, params, errorHandler); }),
|
(_ => { return this.deleteMessages(true, true, params, errorHandler); }),
|
||||||
null, // "OK"
|
null, // "OK"
|
||||||
@@ -257,7 +257,7 @@ class ContextMenu extends React.Component {
|
|||||||
title: formatMessage(messages.block),
|
title: formatMessage(messages.block),
|
||||||
handler: (params, errorHandler) => {
|
handler: (params, errorHandler) => {
|
||||||
return props.onShowAlert(
|
return props.onShowAlert(
|
||||||
formatMessage(messages.block), // title
|
params.topicTitle || formatMessage(messages.block), // title
|
||||||
formatMessage(messages.topic_block_warning), // content
|
formatMessage(messages.topic_block_warning), // content
|
||||||
(_ => this.topicPermissionSetter('-JP', params, errorHandler).then(ctrl => {
|
(_ => this.topicPermissionSetter('-JP', params, errorHandler).then(ctrl => {
|
||||||
this.props.onTopicRemoved(params.topicName);
|
this.props.onTopicRemoved(params.topicName);
|
||||||
@@ -274,7 +274,7 @@ class ContextMenu extends React.Component {
|
|||||||
title: formatMessage(messages.topic_delete),
|
title: formatMessage(messages.topic_delete),
|
||||||
handler: (params, errorHandler) => {
|
handler: (params, errorHandler) => {
|
||||||
return props.onShowAlert(
|
return props.onShowAlert(
|
||||||
formatMessage(messages.topic_delete), // title
|
params.topicTitle || formatMessage(messages.topic_delete), // title
|
||||||
formatMessage(messages.topic_delete_warning), // content
|
formatMessage(messages.topic_delete_warning), // content
|
||||||
(_ => {
|
(_ => {
|
||||||
const topic = this.props.tinode.getTopic(params.topicName);
|
const topic = this.props.tinode.getTopic(params.topicName);
|
||||||
|
|||||||
+6
-5
@@ -8657,7 +8657,7 @@ __webpack_require__.r(__webpack_exports__);
|
|||||||
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|
||||||
/* harmony export */ PACKAGE_VERSION: function() { return /* binding */ PACKAGE_VERSION; }
|
/* harmony export */ PACKAGE_VERSION: function() { return /* binding */ PACKAGE_VERSION; }
|
||||||
/* harmony export */ });
|
/* harmony export */ });
|
||||||
const PACKAGE_VERSION = "0.24.3";
|
const PACKAGE_VERSION = "0.24.4";
|
||||||
|
|
||||||
/***/ }),
|
/***/ }),
|
||||||
|
|
||||||
@@ -17182,6 +17182,7 @@ class Contact extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component) {
|
|||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
this.props.showContextMenu({
|
this.props.showContextMenu({
|
||||||
topicName: this.props.item,
|
topicName: this.props.item,
|
||||||
|
topicTitle: this.props.title,
|
||||||
y: e.pageY,
|
y: e.pageY,
|
||||||
x: e.pageX
|
x: e.pageX
|
||||||
});
|
});
|
||||||
@@ -17526,7 +17527,7 @@ class ContextMenu extends (react__WEBPACK_IMPORTED_MODULE_0___default().Componen
|
|||||||
id: 'messages_clear',
|
id: 'messages_clear',
|
||||||
title: formatMessage(messages.clear_messages),
|
title: formatMessage(messages.clear_messages),
|
||||||
handler: (params, errorHandler) => {
|
handler: (params, errorHandler) => {
|
||||||
return props.onShowAlert(formatMessage(messages.clear_messages), formatMessage(messages.clear_messages_warning), _ => {
|
return props.onShowAlert(params.topicTitle || formatMessage(messages.clear_messages), formatMessage(messages.clear_messages_warning), _ => {
|
||||||
this.deleteMessages(true, false, params, errorHandler);
|
this.deleteMessages(true, false, params, errorHandler);
|
||||||
}, null, true, null);
|
}, null, true, null);
|
||||||
}
|
}
|
||||||
@@ -17535,7 +17536,7 @@ class ContextMenu extends (react__WEBPACK_IMPORTED_MODULE_0___default().Componen
|
|||||||
id: 'messages_clear_hard',
|
id: 'messages_clear_hard',
|
||||||
title: formatMessage(messages.clear_for_all),
|
title: formatMessage(messages.clear_for_all),
|
||||||
handler: (params, errorHandler) => {
|
handler: (params, errorHandler) => {
|
||||||
return props.onShowAlert(formatMessage(messages.clear_for_all), formatMessage(messages.delete_messages_warning), _ => {
|
return props.onShowAlert(params.topicTitle || formatMessage(messages.clear_for_all), formatMessage(messages.delete_messages_warning), _ => {
|
||||||
return this.deleteMessages(true, true, params, errorHandler);
|
return this.deleteMessages(true, true, params, errorHandler);
|
||||||
}, null, true, null);
|
}, null, true, null);
|
||||||
}
|
}
|
||||||
@@ -17620,7 +17621,7 @@ class ContextMenu extends (react__WEBPACK_IMPORTED_MODULE_0___default().Componen
|
|||||||
id: 'topic_block',
|
id: 'topic_block',
|
||||||
title: formatMessage(messages.block),
|
title: formatMessage(messages.block),
|
||||||
handler: (params, errorHandler) => {
|
handler: (params, errorHandler) => {
|
||||||
return props.onShowAlert(formatMessage(messages.block), formatMessage(messages.topic_block_warning), _ => this.topicPermissionSetter('-JP', params, errorHandler).then(ctrl => {
|
return props.onShowAlert(params.topicTitle || formatMessage(messages.block), formatMessage(messages.topic_block_warning), _ => this.topicPermissionSetter('-JP', params, errorHandler).then(ctrl => {
|
||||||
this.props.onTopicRemoved(params.topicName);
|
this.props.onTopicRemoved(params.topicName);
|
||||||
return ctrl;
|
return ctrl;
|
||||||
}), null, true, null);
|
}), null, true, null);
|
||||||
@@ -17630,7 +17631,7 @@ class ContextMenu extends (react__WEBPACK_IMPORTED_MODULE_0___default().Componen
|
|||||||
id: 'topic_delete',
|
id: 'topic_delete',
|
||||||
title: formatMessage(messages.topic_delete),
|
title: formatMessage(messages.topic_delete),
|
||||||
handler: (params, errorHandler) => {
|
handler: (params, errorHandler) => {
|
||||||
return props.onShowAlert(formatMessage(messages.topic_delete), formatMessage(messages.topic_delete_warning), _ => {
|
return props.onShowAlert(params.topicTitle || formatMessage(messages.topic_delete), formatMessage(messages.topic_delete_warning), _ => {
|
||||||
const topic = this.props.tinode.getTopic(params.topicName);
|
const topic = this.props.tinode.getTopic(params.topicName);
|
||||||
if (!topic) {
|
if (!topic) {
|
||||||
console.warn("Topic not found: ", params.topicName);
|
console.warn("Topic not found: ", params.topicName);
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1
-1
@@ -1,3 +1,3 @@
|
|||||||
// This is a generated file. Don't edit.
|
// This is a generated file. Don't edit.
|
||||||
|
|
||||||
const PACKAGE_VERSION = "0.24.3";
|
const PACKAGE_VERSION = "0.24.4";
|
||||||
|
|||||||
Reference in New Issue
Block a user