Skip to content

Commit 1dc5ea1

Browse files
or-elseor-else
committed
ux improvemnt: use contact name as title in alert dialog
1 parent 3a4794b commit 1dc5ea1

9 files changed

Lines changed: 22 additions & 16 deletions

File tree

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "tinode-webapp",
33
"description": "Tinode messenger for the web",
4-
"version": "0.24.3",
4+
"version": "0.24.4",
55
"repository": {
66
"type": "git",
77
"url": "git+https://github.com/tinode/webapp.git"

‎src/version.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// This is a generated file. Don't edit.
22

3-
export const PACKAGE_VERSION = "0.24.3";
3+
export const PACKAGE_VERSION = "0.24.4";

‎src/widgets/contact.jsx‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,12 @@ class Contact extends React.Component {
4646
handleContextClick(e) {
4747
e.preventDefault();
4848
e.stopPropagation();
49-
this.props.showContextMenu({ topicName: this.props.item, y: e.pageY, x: e.pageX });
49+
this.props.showContextMenu({
50+
topicName: this.props.item,
51+
topicTitle: this.props.title,
52+
y: e.pageY,
53+
x: e.pageX
54+
});
5055
}
5156

5257
render() {

‎src/widgets/context-menu.jsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ class ContextMenu extends React.Component {
152152
title: formatMessage(messages.clear_messages),
153153
handler: (params, errorHandler) => {
154154
return props.onShowAlert(
155-
formatMessage(messages.clear_messages), // title
155+
params.topicTitle || formatMessage(messages.clear_messages), // title
156156
formatMessage(messages.clear_messages_warning), // content
157157
(_ => { this.deleteMessages(true, false, params, errorHandler); }), // onConfirm
158158
null, // "OK"
@@ -166,7 +166,7 @@ class ContextMenu extends React.Component {
166166
title: formatMessage(messages.clear_for_all),
167167
handler: (params, errorHandler) => {
168168
return props.onShowAlert(
169-
formatMessage(messages.clear_for_all), // title
169+
params.topicTitle || formatMessage(messages.clear_for_all), // title
170170
formatMessage(messages.delete_messages_warning), // content
171171
(_ => { return this.deleteMessages(true, true, params, errorHandler); }),
172172
null, // "OK"
@@ -257,7 +257,7 @@ class ContextMenu extends React.Component {
257257
title: formatMessage(messages.block),
258258
handler: (params, errorHandler) => {
259259
return props.onShowAlert(
260-
formatMessage(messages.block), // title
260+
params.topicTitle || formatMessage(messages.block), // title
261261
formatMessage(messages.topic_block_warning), // content
262262
(_ => this.topicPermissionSetter('-JP', params, errorHandler).then(ctrl => {
263263
this.props.onTopicRemoved(params.topicName);
@@ -274,7 +274,7 @@ class ContextMenu extends React.Component {
274274
title: formatMessage(messages.topic_delete),
275275
handler: (params, errorHandler) => {
276276
return props.onShowAlert(
277-
formatMessage(messages.topic_delete), // title
277+
params.topicTitle || formatMessage(messages.topic_delete), // title
278278
formatMessage(messages.topic_delete_warning), // content
279279
(_ => {
280280
const topic = this.props.tinode.getTopic(params.topicName);

‎umd/index.dev.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8657,7 +8657,7 @@ __webpack_require__.r(__webpack_exports__);
86578657
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
86588658
/* harmony export */ PACKAGE_VERSION: function() { return /* binding */ PACKAGE_VERSION; }
86598659
/* harmony export */ });
8660-
const PACKAGE_VERSION = "0.24.3";
8660+
const PACKAGE_VERSION = "0.24.4";
86618661

86628662
/***/ }),
86638663

@@ -17182,6 +17182,7 @@ class Contact extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component) {
1718217182
e.stopPropagation();
1718317183
this.props.showContextMenu({
1718417184
topicName: this.props.item,
17185+
topicTitle: this.props.title,
1718517186
y: e.pageY,
1718617187
x: e.pageX
1718717188
});
@@ -17526,7 +17527,7 @@ class ContextMenu extends (react__WEBPACK_IMPORTED_MODULE_0___default().Componen
1752617527
id: 'messages_clear',
1752717528
title: formatMessage(messages.clear_messages),
1752817529
handler: (params, errorHandler) => {
17529-
return props.onShowAlert(formatMessage(messages.clear_messages), formatMessage(messages.clear_messages_warning), _ => {
17530+
return props.onShowAlert(params.topicTitle || formatMessage(messages.clear_messages), formatMessage(messages.clear_messages_warning), _ => {
1753017531
this.deleteMessages(true, false, params, errorHandler);
1753117532
}, null, true, null);
1753217533
}
@@ -17535,7 +17536,7 @@ class ContextMenu extends (react__WEBPACK_IMPORTED_MODULE_0___default().Componen
1753517536
id: 'messages_clear_hard',
1753617537
title: formatMessage(messages.clear_for_all),
1753717538
handler: (params, errorHandler) => {
17538-
return props.onShowAlert(formatMessage(messages.clear_for_all), formatMessage(messages.delete_messages_warning), _ => {
17539+
return props.onShowAlert(params.topicTitle || formatMessage(messages.clear_for_all), formatMessage(messages.delete_messages_warning), _ => {
1753917540
return this.deleteMessages(true, true, params, errorHandler);
1754017541
}, null, true, null);
1754117542
}
@@ -17620,7 +17621,7 @@ class ContextMenu extends (react__WEBPACK_IMPORTED_MODULE_0___default().Componen
1762017621
id: 'topic_block',
1762117622
title: formatMessage(messages.block),
1762217623
handler: (params, errorHandler) => {
17623-
return props.onShowAlert(formatMessage(messages.block), formatMessage(messages.topic_block_warning), _ => this.topicPermissionSetter('-JP', params, errorHandler).then(ctrl => {
17624+
return props.onShowAlert(params.topicTitle || formatMessage(messages.block), formatMessage(messages.topic_block_warning), _ => this.topicPermissionSetter('-JP', params, errorHandler).then(ctrl => {
1762417625
this.props.onTopicRemoved(params.topicName);
1762517626
return ctrl;
1762617627
}), null, true, null);
@@ -17630,7 +17631,7 @@ class ContextMenu extends (react__WEBPACK_IMPORTED_MODULE_0___default().Componen
1763017631
id: 'topic_delete',
1763117632
title: formatMessage(messages.topic_delete),
1763217633
handler: (params, errorHandler) => {
17633-
return props.onShowAlert(formatMessage(messages.topic_delete), formatMessage(messages.topic_delete_warning), _ => {
17634+
return props.onShowAlert(params.topicTitle || formatMessage(messages.topic_delete), formatMessage(messages.topic_delete_warning), _ => {
1763417635
const topic = this.props.tinode.getTopic(params.topicName);
1763517636
if (!topic) {
1763617637
console.warn("Topic not found: ", params.topicName);

‎umd/index.dev.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎umd/index.prod.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎umd/index.prod.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎version.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// This is a generated file. Don't edit.
22

3-
const PACKAGE_VERSION = "0.24.3";
3+
const PACKAGE_VERSION = "0.24.4";

0 commit comments

Comments
 (0)