fix broken confirmation menus

This commit is contained in:
or-else
2021-03-14 14:04:46 -07:00
parent c2b1433ed6
commit d4f299aa40
9 changed files with 17 additions and 16 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
{ {
"name": "tinode-webapp", "name": "tinode-webapp",
"description": "Tinode messenger for the web", "description": "Tinode messenger for the web",
"version": "0.17.0-alpha1", "version": "0.17.0-alpha2",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/tinode/example-react-js.git" "url": "https://github.com/tinode/example-react-js.git"
@@ -72,7 +72,7 @@
"react": "^17.0.1", "react": "^17.0.1",
"react-dom": "^17.0.1", "react-dom": "^17.0.1",
"react-intl": "^5.13.1", "react-intl": "^5.13.1",
"tinode-sdk": "^0.17.0-alpha1" "tinode-sdk": "^0.17.0-alpha2"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.13.8", "@babel/core": "^7.13.8",
+1 -1
View File
@@ -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.17.0-alpha1"; export const PACKAGE_VERSION = "0.17.0-alpha2";
+3 -3
View File
@@ -122,7 +122,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.menu_item_clear_messages), // title 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"
@@ -136,7 +136,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.menu_item_clear_messages_for_all), // title formatMessage(messages.clear_for_all), // title
formatMessage(message.delete_messages_warning), // content formatMessage(message.delete_messages_warning), // content
(() => { return this.deleteMessages(true, true, params, errorHandler); }), (() => { return this.deleteMessages(true, true, params, errorHandler); }),
null, // "OK" null, // "OK"
@@ -205,7 +205,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.menu_item_delete_topic), // title 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);
+4 -4
View File
@@ -702,7 +702,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.17.0-alpha1"; const PACKAGE_VERSION = "0.17.0-alpha2";
/***/ }), /***/ }),
@@ -8042,7 +8042,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.menu_item_clear_messages), formatMessage(messages.clear_messages_warning), () => { return props.onShowAlert(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);
} }
@@ -8051,7 +8051,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.menu_item_clear_messages_for_all), formatMessage(message.delete_messages_warning), () => { return props.onShowAlert(formatMessage(messages.clear_for_all), formatMessage(message.delete_messages_warning), () => {
return this.deleteMessages(true, true, params, errorHandler); return this.deleteMessages(true, true, params, errorHandler);
}, null, true, null); }, null, true, null);
} }
@@ -8108,7 +8108,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.menu_item_delete_topic), formatMessage(messages.topic_delete_warning), () => { return props.onShowAlert(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) {
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+3 -2
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long