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

recent_topics: Rename muted filter to include_muted.

Browse Source 
This adds clarity to what this filter really does.
Revert muted variable rename via
e769323d0c.
This commit is contained in:
Aman Agrawal
2020-06-14 12:39:30 +05:30
committed by Tim Abbott
parent 8a163840f4
commit 57aee34845
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
static/js/recent_topics.js
View File

@@ -175,8 +175,8 @@ function filters_should_hide_topic(topic_data) {
const topic_muted = !!muting.is_topic_muted(msg.stream_id, msg.topic); const topic_muted = !!muting.is_topic_muted(msg.stream_id, msg.topic);
const stream_muted = stream_data.is_muted(msg.stream_id); const stream_muted = stream_data.is_muted(msg.stream_id);
const include_muted = topic_muted || stream_muted; const muted = topic_muted || stream_muted;
if (include_muted && !filters.has('muted')) { if (muted && !filters.has('include_muted')) {
return true; return true;
} }
@@ -267,7 +267,7 @@ exports.update_filters_view = function () {
const rendered_filters = render_recent_topics_filters({ const rendered_filters = render_recent_topics_filters({
filter_participated: filters.has('participated'), filter_participated: filters.has('participated'),
filter_unread: filters.has('unread'), filter_unread: filters.has('unread'),
filter_muted: filters.has('muted'), filter_muted: filters.has('include_muted'),
}); });
$("#recent_filters_group").html(rendered_filters); $("#recent_filters_group").html(rendered_filters);
show_selected_filters(); show_selected_filters();
@@ -306,7 +306,7 @@ exports.complete_rerender = function () {
const rendered_body = render_recent_topics_body({ const rendered_body = render_recent_topics_body({
filter_participated: filters.has('participated'), filter_participated: filters.has('participated'),
filter_unread: filters.has('unread'), filter_unread: filters.has('unread'),
filter_muted: filters.has('muted'), filter_muted: filters.has('include_muted'),
search_val: $("#recent_topics_search").val() || "", search_val: $("#recent_topics_search").val() || "",
}); });
$('#recent_topics_table').html(rendered_body); $('#recent_topics_table').html(rendered_body);

2
static/templates/recent_topics_filters.hbs
View File

@@ -15,7 +15,7 @@
{{/if}} {{/if}}
{{t 'Participated' }} {{t 'Participated' }}
</button> </button>
<button data-filter="muted" type="button" class="btn btn-default btn-recent-filters"> <button data-filter="include_muted" type="button" class="btn btn-default btn-recent-filters">
{{#if filter_muted }} {{#if filter_muted }}
<i class="fa fa-check-square-o"></i> <i class="fa fa-check-square-o"></i>
{{else}} {{else}}