dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix undefined notifications

This commit is contained in:
yflory 2021-04-14 15:47:57 +02:00
parent 6131e89505
commit a2d52d7026
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www/common/outer/mailbox.js
View File

@ -501,8 +501,11 @@ proxy.mailboxes = {
hash: h hash: h
}; };
showMessage(ctx, type, message, cId, function (obj) { showMessage(ctx, type, message, cId, function (obj) {
if (obj.error) { return; }
// Notify only if "requiresNotif" is true
if (!message.msg || !message.msg.requiresNotif) { return; }
Notify.system(undefined, obj.msg); Notify.system(undefined, obj.msg);
cb(); delete message.msg.requiresNotif;
}); });
}); });
}); });
@ -590,6 +593,9 @@ proxy.mailboxes = {
mailbox.showMessage = function (type, msg, cId, cb) { mailbox.showMessage = function (type, msg, cId, cb) {
if (type === "reminders" && msg) { if (type === "reminders" && msg) {
ctx.boxes.reminders.content[msg.hash] = msg.msg; ctx.boxes.reminders.content[msg.hash] = msg.msg;
if (!ctx.clients.length) {
ctx.boxes.reminders.content[msg.hash].requiresNotif = true;
}
// Hide existing messages for this event // Hide existing messages for this event
hideMessage(ctx, type, msg.hash, ctx.clients); hideMessage(ctx, type, msg.hash, ctx.clients);
} }