CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-07-12 21:04:41 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

navbar: Switch make_tab_bar conditionals to using filter/sub values.

Browse Source 
Previously, this function relied on the return value of
`filter.get_icon()` which made it brittle.
Directly using the properties of the filter and sub object makes this
more explicit about the intentions and robust.
This commit is contained in:
YashRE42 2020-06-16 17:20:22 +00:00 committed by Tim Abbott
parent 7ea60ea1ab
commit ab2e7e097a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
static/js/tab_bar.js
View File

@ -25,13 +25,16 @@ function make_tab_data(filter) {
}
tab_data.title = filter.get_title();
tab_data.icon = filter.get_icon();
if (tab_data.icon === 'question-circle-o') {
if (filter.has_operator('stream') && !filter._sub) {
tab_data.sub_count = '0';
tab_data.formatted_sub_count = '0';
tab_data.rendered_narrow_description = i18n.t("This stream does not exist or is private.");
return tab_data;
}
if (['hashtag', 'lock', 'globe'].includes(tab_data.icon)) {
if (filter._sub) {
// We can now be certain that the narrow
// involves a stream which exists and
// the current user can access.
const stream = filter.operands("stream")[0];
// We can rely on current_stream because if the stream doesn't
// exist then the "question-circle-o" case would case early exit.