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

resolving merge conflict

Browse Source
This commit is contained in:
or-else
2021-01-27 09:42:25 -08:00
parent 4f38a2d8b1 1172adefb4
commit 6f47cc50b0
9 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
umd/index.dev.js
+9 -3
View File
@@ -7959,7 +7959,9 @@ class ContextMenu extends (react__WEBPACK_IMPORTED_MODULE_0___default().Componen
id: 'messages_clear',
title: formatMessage(messages.clear_messages),
handler: (params, errorHandler) => {
return props.onShowAlert(formatMessage(messages.menu_item_clear_messages), formatMessage(messages.clear_messages_warning), () => {
return props.onShowAlert(formatMessage(messages.menu_item_clear_messages), formatMessage({
"id": "clear_messages_warning"
}), () => {
this.deleteMessages(true, false, params, errorHandler);
}, null, true, null);
}
@@ -7968,7 +7970,9 @@ class ContextMenu extends (react__WEBPACK_IMPORTED_MODULE_0___default().Componen
id: 'messages_clear_hard',
title: formatMessage(messages.clear_for_all),
handler: (params, errorHandler) => {
return props.onShowAlert(formatMessage(messages.menu_item_clear_messages_for_all), formatMessage(messages.delete_messages_warning), () => {
return props.onShowAlert(formatMessage(messages.menu_item_clear_messages_for_all), formatMessage({
"id": "delete_messages_warning"
}), () => {
return this.deleteMessages(true, true, params, errorHandler);
}, null, true, null);
}
@@ -8061,7 +8065,9 @@ class ContextMenu extends (react__WEBPACK_IMPORTED_MODULE_0___default().Componen
},
'permissions': {
id: 'permissions',
title: formatMessage(messages.menu_item_edit_permissions),
title: formatMessage({
"id": "menu_item_edit_permissions"
}),
handler: null
},
'member_delete': {