paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 15:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

notifications.js: Make in-browser notifications clickable

Browse Source 
You can now click the notifications you get in your browser and go
to that stream/topic/private message using jQuery's .on() method.

Fixes: #1996.
This commit is contained in:
KingxBanana
2016-12-23 15:33:08 +01:00
committed by showell
parent 38b0b3ffb5
commit 5f77ce1ce8
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
static/js/notifications.js
View File

@@ -217,7 +217,7 @@ exports.window_has_focus = function () {
return window_has_focus; return window_has_focus;
}; };
function in_browser_notify(message, title, content) { function in_browser_notify(message, title, content, raw_operators, opts) {
var notification_html = $(templates.render('notification', {gravatar_url: ui.small_avatar_url(message), var notification_html = $(templates.render('notification', {gravatar_url: ui.small_avatar_url(message),
title: title, title: title,
content: content})); content: content}));
@@ -225,6 +225,11 @@ function in_browser_notify(message, title, content) {
message: {html: notification_html}, message: {html: notification_html},
fadeOut: {enabled: true, delay: 4000} fadeOut: {enabled: true, delay: 4000}
}).show(); }).show();
$('.top-right').on('click', function () {
ui.change_tab_to('#home');
narrow.activate(raw_operators, opts);
});
setTimeout(function () {$('.top-right').unbind("click");}, 5000);
} }
exports.notify_above_composebox = function (note, link_class, link_msg_id, link_text) { exports.notify_above_composebox = function (note, link_class, link_msg_id, link_text) {
@@ -247,7 +252,8 @@ function process_notification(notification) {
var title = message.sender_full_name; var title = message.sender_full_name;
var msg_count = 1; var msg_count = 1;
var notification_source; var notification_source;
var raw_operators = [];
var opts = {select_first_unread: true, trigger: "notification click"};
// Convert the content to plain text, replacing emoji with their alt text // Convert the content to plain text, replacing emoji with their alt text
content = $('<div/>').html(message.content); content = $('<div/>').html(message.content);
ui.replace_emoji_with_text(content); ui.replace_emoji_with_text(content);
@@ -303,9 +309,12 @@ function process_notification(notification) {
" other people"; " other people";
} }
title += " (to you and " + other_recipients + ")"; title += " (to you and " + other_recipients + ")";
raw_operators = [{operand: message.reply_to, operator: "pm-with"}];
} }
if (message.type === "stream") { if (message.type === "stream") {
title += " (to " + message.stream + " > " + message.subject + ")"; title += " (to " + message.stream + " > " + message.subject + ")";
raw_operators = [{operand: message.stream, operator: "stream"}];
if (message.subject !== "(no topic)") {raw_operators[1] = {operand: message.subject, operator: "topic"};}
} }
if (window.bridge === undefined && notification.webkit_notify === true) { if (window.bridge === undefined && notification.webkit_notify === true) {
@@ -336,11 +345,11 @@ function process_notification(notification) {
iconUrl: ui.small_avatar_url(message) iconUrl: ui.small_avatar_url(message)
}); });
} else { } else {
in_browser_notify(message, title, content); in_browser_notify(message, title, content, raw_operators, opts);
} }
}); });
} else if (notification.webkit_notify === false) { } else if (notification.webkit_notify === false) {
in_browser_notify(message, title, content); in_browser_notify(message, title, content, raw_operators, opts);
} else { } else {
// Shunt the message along to the desktop client // Shunt the message along to the desktop client
window.bridge.desktopNotification(title, content, notification_source); window.bridge.desktopNotification(title, content, notification_source);