paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 04:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

notifications: Remove long-gone webkitNotifications draft API.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg
2020-04-26 15:20:20 -07:00
committed by Tim Abbott
parent 8138e06935
commit 0b1c27192f
2 changed files with 30 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
frontend_tests/node_tests/notifications.js
View File

@@ -254,23 +254,24 @@ run_test('basic_notifications', () => {
let last_shown_message_id = null;
// Notifications API stub
notifications.set_notification_api({
createNotification: function createNotification(icon, title, content, tag) {
const notification_object = {icon: icon, body: content, tag: tag};
class StubNotification {
constructor(title, { icon, body, tag }) {
this.icon = icon;
this.body = body;
this.tag = tag;
// properties for testing.
notification_object.tests = {
this.tests = {
shown: false,
};
notification_object.show = function () {
last_shown_message_id = this.tag;
};
notification_object.close = function () {
last_closed_message_id = this.tag;
};
notification_object.cancel = function () { notification_object.close(); };
return notification_object;
},
});
last_shown_message_id = this.tag;
}
close() {
last_closed_message_id = this.tag;
}
}
notifications.set_notification_api(StubNotification);
const message_1 = {
id: 1000,

48
static/js/notifications.js
View File

@@ -15,40 +15,21 @@ let current_favicon;
let previous_favicon;
let flashing = false;
let notifications_api;
let NotificationAPI;
exports.set_notification_api = function (n) {
notifications_api = n;
NotificationAPI = n;
};
if (window.webkitNotifications) {
notifications_api = window.webkitNotifications;
} else if (window.Notification) {
// Build a shim to the new notification API
notifications_api = {
checkPermission: function checkPermission() {
if (window.Notification.permission === 'granted') {
return 0;
}
return 2;
},
requestPermission: window.Notification.requestPermission,
createNotification: function createNotification(icon, title, content, tag) {
const notification_object = new window.Notification(title, {icon: icon,
body: content,
tag: tag});
notification_object.show = function () {};
notification_object.cancel = function () { notification_object.close(); };
return notification_object;
},
};
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.cancel();
notification_object.close();
}
exports.get_notifications = function () {
@@ -402,15 +383,18 @@ function process_notification(notification) {
// Firefox on Ubuntu claims to do webkitNotifications but its notifications are terrible
if (notification.desktop_notify && /webkit/i.test(navigator.userAgent)) {
const icon_url = people.small_avatar_url(message);
notification_object =
notifications_api.createNotification(icon_url, title, content, message.id);
notification_object = new NotificationAPI(title, {
icon: icon_url,
body: content,
tag: message.id,
});
notice_memory.set(key, {
obj: notification_object,
msg_count: msg_count,
message_id: message.id,
});
notification_object.onclick = function () {
notification_object.cancel();
notification_object.close();
if (message.type !== "test-notification") {
narrow.by_topic(message.id, {trigger: 'notification'});
}
@@ -419,7 +403,6 @@ function process_notification(notification) {
notification_object.onclose = function () {
notice_memory.delete(key);
};
notification_object.show();
} else if (notification.desktop_notify && typeof Notification !== "undefined" && /mozilla/i.test(navigator.userAgent)) {
Notification.requestPermission(function (perm) {
if (perm === 'granted') {
@@ -575,15 +558,14 @@ exports.should_send_audible_notification = function (message) {
};
exports.granted_desktop_notifications_permission = function () {
return notifications_api &&
// 0 is PERMISSION_ALLOWED
notifications_api.checkPermission() === 0;
return NotificationAPI &&
NotificationAPI.permission === "granted";
};
exports.request_desktop_notifications_permission = function () {
if (notifications_api) {
return notifications_api.requestPermission();
if (NotificationAPI) {
return NotificationAPI.requestPermission();
}
};