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

stream_list: Use unread_counts class for showing unread count.

Browse Source
This commit is contained in:
Aman Agrawal
2021-04-09 14:40:09 +00:00
committed by Tim Abbott
parent 84afc67369
commit b6d9577b48
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
static/js/stream_list.js
View File

@@ -20,6 +20,7 @@ import * as stream_sort from "./stream_sort";
import * as topic_list from "./topic_list"; import * as topic_list from "./topic_list";
import * as topic_zoom from "./topic_zoom"; import * as topic_zoom from "./topic_zoom";
import * as ui from "./ui"; import * as ui from "./ui";
import * as ui_util from "./ui_util";
import * as unread from "./unread"; import * as unread from "./unread";
export let stream_cursor; export let stream_cursor;
@@ -27,24 +28,19 @@ export let stream_cursor;
let has_scrolled = false; let has_scrolled = false;
export function update_count_in_dom(unread_count_elem, count) { export function update_count_in_dom(unread_count_elem, count) {
const count_span = unread_count_elem.find(".count"); ui_util.update_unread_count_in_dom(unread_count_elem, count);
const value_span = count_span.find(".value");
const count_span = unread_count_elem.find(".unread_count");
if (count === 0) { if (count === 0) {
count_span.hide();
if (count_span.parent().hasClass("subscription_block")) { if (count_span.parent().hasClass("subscription_block")) {
count_span.parent(".subscription_block").removeClass("stream-with-count"); count_span.parent(".subscription_block").removeClass("stream-with-count");
} }
value_span.text("");
return; return;
} }
count_span.show();
if (count_span.parent().hasClass("subscription_block")) { if (count_span.parent().hasClass("subscription_block")) {
count_span.parent(".subscription_block").addClass("stream-with-count"); count_span.parent(".subscription_block").addClass("stream-with-count");
} }
value_span.text(count);
} }
class StreamSidebar { class StreamSidebar {

4
static/styles/left_sidebar.css
View File

@@ -100,7 +100,7 @@ li.show-more-topics {
} }
} }
.count { .subscription_block .unread_count {
margin-right: 15px; margin-right: 15px;
} }
@@ -289,7 +289,6 @@ li.top_left_recent_topics {
font-size: 13px; font-size: 13px;
} }
#stream_filters .count,
.topic-unread-count, .topic-unread-count,
.private_message_count { .private_message_count {
float: right; float: right;
@@ -313,7 +312,6 @@ li.top_left_recent_topics {
} }
/* These are true "unread" counts. */ /* These are true "unread" counts. */
#stream_filters .count,
.topic-unread-count, .topic-unread-count,
.private_message_count { .private_message_count {
background-color: hsl(105, 2%, 50%); background-color: hsl(105, 2%, 50%);

2
static/templates/stream_sidebar_row.hbs
View File

@@ -10,7 +10,7 @@
<a href="{{uri}}" title="{{name}}" class="stream-name">{{name}}</a> <a href="{{uri}}" title="{{name}}" class="stream-name">{{name}}</a>
<div class="count"><div class="value"></div></div> <span class="unread_count"></span>
</div> </div>
<span class="stream-sidebar-menu-icon"><i class="zulip-icon ellipsis-v-solid" aria-hidden="true"></i></span> <span class="stream-sidebar-menu-icon"><i class="zulip-icon ellipsis-v-solid" aria-hidden="true"></i></span>
</div> </div>