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

Don't mark messages as read by visibility.

Browse Source 
Trac #1428

(imported from commit b67e52d7434220e397ca20ffa49915de6633519c)
This commit is contained in:
Kevin Mehall
2013-07-02 14:33:00 -04:00
parent 318d66ed9e
commit 22c1a66da8
6 changed files with 45 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
zephyr/static/js/notifications.js
View File

@@ -30,10 +30,6 @@ exports.initialize = function () {
$.each(notice_memory, function (index, notice_mem_entry) {
notice_mem_entry.obj.cancel();
});
// Update many places on the DOM to reflect unread
// counts.
process_visible_unread_messages();
}).blur(function () {
window_has_focus = false;
});
@@ -268,18 +264,28 @@ function message_is_notifiable(message) {
subs.receives_notifications(message.stream))));
}
function message_is_visible (vp, message) {
if (! notifications.window_has_focus()) {
return false;
}
var top = vp.visible_top;
var height = vp.visible_height;
var row = rows.get(message.id, current_msg_list.table_name);
var row_offset = row.offset();
var row_height = row.height();
// Very tall messages are visible once we've gotten past them
return (row_height > height && row_offset.top > top) || within_viewport(row_offset, row_height);
}
exports.received_messages = function (messages) {
var i;
var vp = viewport.message_viewport_info();
$.each(messages, function (index, message) {
// We send notifications for messages which the user has
// configured as notifiable, as long as they haven't been
// marked as read by process_visible_unread_messages
// (which occurs if the message arrived onscreen while the
// window had focus).
if (!(message_is_notifiable(message) && unread.message_unread(message))) {
return;
}
if (!message_is_notifiable(message)) return;
if (message_is_visible(vp, message)) return;
if (page_params.desktop_notifications_enabled &&
browser_desktop_notifications_on()) {
process_notification({message: message, webkit_notify: true});