fix menu [delete for all]
This commit is contained in:
@@ -925,11 +925,11 @@ class MessagesView extends React.Component {
|
|||||||
let canDelete = acs.isOwner();
|
let canDelete = acs.isOwner();
|
||||||
if (!canDelete) {
|
if (!canDelete) {
|
||||||
// Not owner: check message age if configured on the server.
|
// Not owner: check message age if configured on the server.
|
||||||
const maxAge = this.props.tinode.getServerParam(Tinode.MSG_DELETE_AGE, 0) | 0;
|
const maxDelAge = this.props.tinode.getServerParam(Tinode.MSG_DELETE_AGE, 0) | 0;
|
||||||
if (maxAge > 0 && params.timestamp) {
|
// Make sure the message is not too old. This check is here just to make the UI
|
||||||
// Make sure the message is not too old.
|
// more user-friendly. The server will enforce the limit regardless of this.
|
||||||
canDelete = params.timestamp.getTime() > (new Date().getTime() - maxAge * 1000);
|
canDelete = maxDelAge == 0 || (maxDelAge > 0 && params.timestamp ?
|
||||||
}
|
params.timestamp.getTime() > (new Date().getTime() - maxDelAge * 1000) : false);
|
||||||
}
|
}
|
||||||
if (canDelete) {
|
if (canDelete) {
|
||||||
// [Delete for All] title.
|
// [Delete for All] title.
|
||||||
|
|||||||
+2
-5
@@ -10861,10 +10861,8 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
|
|||||||
if (acs && acs.isDeleter()) {
|
if (acs && acs.isDeleter()) {
|
||||||
let canDelete = acs.isOwner();
|
let canDelete = acs.isOwner();
|
||||||
if (!canDelete) {
|
if (!canDelete) {
|
||||||
const maxAge = this.props.tinode.getServerParam(tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Tinode.MSG_DELETE_AGE, 0) | 0;
|
const maxDelAge = this.props.tinode.getServerParam(tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Tinode.MSG_DELETE_AGE, 0) | 0;
|
||||||
if (maxAge > 0 && params.timestamp) {
|
canDelete = maxDelAge == 0 || (maxDelAge > 0 && params.timestamp ? params.timestamp.getTime() > new Date().getTime() - maxDelAge * 1000 : false);
|
||||||
canDelete = params.timestamp.getTime() > new Date().getTime() - maxAge * 1000;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (canDelete) {
|
if (canDelete) {
|
||||||
menuItems.push('message_delete_hard');
|
menuItems.push('message_delete_hard');
|
||||||
@@ -18772,7 +18770,6 @@ class InPlaceEdit extends (react__WEBPACK_IMPORTED_MODULE_0___default().Componen
|
|||||||
});
|
});
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
if (err) {
|
if (err) {
|
||||||
console.log('Validation error:', err);
|
|
||||||
this.setState({
|
this.setState({
|
||||||
valid: false
|
valid: false
|
||||||
});
|
});
|
||||||
|
|||||||
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
Reference in New Issue
Block a user