CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-06-24 21:08:25 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

notifications: Remove cancel_notification_object wrapper.

Browse Source 
Running the close handler won’t break anything; it’s safe to delete
from a Map while iterating through it.

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg 2020-04-26 15:27:03 -07:00 committed by Tim Abbott
parent 0b1c27192f
commit a16cddf84f
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
static/js/notifications.js
View File

@ -25,13 +25,6 @@ if (window.Notification) {
NotificationAPI = window.Notification;
}
function cancel_notification_object(notification_object) {
// We must remove the .onclose so that it does not trigger on .cancel
notification_object.onclose = function () {};
notification_object.onclick = function () {};
notification_object.close();
}
exports.get_notifications = function () {
return notice_memory;
};
@ -49,7 +42,7 @@ exports.initialize = function () {
window_has_focus = true;
for (const notice_mem_entry of notice_memory.values()) {
cancel_notification_object(notice_mem_entry.obj);
notice_mem_entry.obj.close();
}
notice_memory.clear();
@ -351,7 +344,7 @@ function process_notification(notification) {
msg_count = notice_memory.get(key).msg_count + 1;
title = msg_count + " messages from " + title;
notification_object = notice_memory.get(key).obj;
cancel_notification_object(notification_object);
notification_object.close();
}
if (message.type === "private") {
@ -435,7 +428,7 @@ exports.process_notification = process_notification;
exports.close_notification = function (message) {
for (const [key, notice_mem_entry] of notice_memory) {
if (notice_mem_entry.message_id === message.id) {
cancel_notification_object(notice_mem_entry.obj);
notice_mem_entry.obj.close();
notice_memory.delete(key);
}
}