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

notifications: Allow only notifiable in unread count.

Browse Source 
This commit adds a new setting to the user's notification settings that
will change the behaviour of the unread count in the title bar and
desktop application.

When enabled, the title bar will show the count of unread private messages
and mentions. When disabled, the title bar will act as before, showing
the total number of unread messages.

Fixes #1736.
This commit is contained in:
David Wood
2019-06-29 21:00:44 +01:00
committed by Tim Abbott
parent ca23740478
commit 9bace3f2cd
13 changed files with 110 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
static/js/settings_notifications.js
View File

@@ -32,6 +32,7 @@ var email_notification_settings = [
];
var other_notification_settings = desktop_notification_settings.concat(
["desktop_icon_count_display"],
mobile_notification_settings,
email_notification_settings,
["notification_sound"]
@@ -63,12 +64,29 @@ exports.all_notifications = {
},
};
exports.desktop_icon_count_display_values = {
messages: {
code: 1,
description: i18n.t("All unreads"),
},
notifiable: {
code: 2,
description: i18n.t("Private messages and mentions"),
},
};
function change_notification_setting(setting, setting_data, status_element) {
var data = {};
data[setting] = JSON.stringify(setting_data);
settings_ui.do_settings_change(channel.patch, '/json/settings/notifications', data, status_element);
}
function update_desktop_icon_count_display() {
$("#desktop_icon_count_display").val(page_params.desktop_icon_count_display);
var res = unread.get_counts();
notifications.update_title_count(res);
}
exports.set_enable_digest_emails_visibility = function () {
if (page_params.realm_digest_emails_enabled) {
$('#enable_digest_emails_label').parent().show();
@@ -83,9 +101,11 @@ exports.set_up = function () {
$("#" + sub_setting).change(function () {
var value;
// `notification_sound` and `desktop_icon_count_display` are not booleans.
if (sub_setting === "notification_sound") {
// `notification_sound` is not a boolean.
value = $(this).val();
} else if (sub_setting === "desktop_icon_count_display") {
value = parseInt($(this).val(), 10);
} else {
value = $(this).prop('checked');
}
@@ -95,6 +115,8 @@ exports.set_up = function () {
});
});
update_desktop_icon_count_display();
$("#play_notification_sound").click(function () {
$("#notifications-area").find("audio")[0].play();
});
@@ -121,7 +143,11 @@ exports.update_page = function () {
// If push notifications are disabled at the realm level,
// we should just leave the checkbox always off.
return;
} else if (setting === 'desktop_icon_count_display') {
update_desktop_icon_count_display();
return;
}
$("#" + setting).prop('checked', page_params[setting]);
});
};