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

left_sidebar: Remove unnecessary nested #direct-messages-section.

Browse Source 
`#direct-messages-section-header` will take over existing behaviour of
`#direct-messages-section`.
This commit is contained in:
Shubham Padia
2024-07-04 10:46:35 +00:00
committed by Tim Abbott
parent 847ff6ee21
commit 737e075cc3
4 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/pm_list.ts
View File

@@ -23,7 +23,7 @@ let private_messages_collapsed = false;
let zoomed = false; let zoomed = false;
function get_private_messages_section_header(): JQuery { function get_private_messages_section_header(): JQuery {
return $(".direct-messages-container #direct-messages-section #direct-messages-section-header"); return $(".direct-messages-container #direct-messages-section-header");
} }
export function set_count(count: number): void { export function set_count(count: number): void {

2
web/styles/left_sidebar.css
View File

@@ -313,7 +313,7 @@ li.show-more-topics {
.active-direct-messages-section { .active-direct-messages-section {
background-color: var(--color-background-active-narrow-filter); background-color: var(--color-background-active-narrow-filter);
#direct-messages-section { #direct-messages-section-header {
border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0;
} }

22
web/templates/left_sidebar.hbs
View File

@@ -144,20 +144,18 @@
</div> </div>
<div id="direct-messages-sticky-header" class="direct-messages-container zoom-out hidden-for-spectators"> <div id="direct-messages-sticky-header" class="direct-messages-container zoom-out hidden-for-spectators">
<div id="direct-messages-section"> <div id="direct-messages-section-header" class="zoom-out zoom-in-sticky">
<div id="direct-messages-section-header" class="zoom-out zoom-in-sticky"> <i id="toggle-direct-messages-section-icon" class="fa fa-sm fa-caret-down dm-tooltip-target zoom-in-hide" aria-hidden="true" tabindex="0" role="button"></i>
<i id="toggle-direct-messages-section-icon" class="fa fa-sm fa-caret-down dm-tooltip-target zoom-in-hide" aria-hidden="true" tabindex="0" role="button"></i> <h4 class="left-sidebar-title"><span class="dm-tooltip-target">{{t 'DIRECT MESSAGES' }}</span></h4>
<h4 class="left-sidebar-title"><span class="dm-tooltip-target">{{t 'DIRECT MESSAGES' }}</span></h4> <div class="heading-markers-and-controls">
<div class="heading-markers-and-controls"> <a id="show-all-direct-messages" href="#narrow/is/dm" data-tooltip-template-id="show-all-direct-messages-template">
<a id="show-all-direct-messages" href="#narrow/is/dm" data-tooltip-template-id="show-all-direct-messages-template"> <i class="fa fa-align-right" aria-label="{{t 'Direct message feed' }}"></i>
<i class="fa fa-align-right" aria-label="{{t 'Direct message feed' }}"></i>
</a>
<span class="unread_count"></span>
</div>
<a class="zoom-out-hide" id="hide-more-direct-messages">
<span class="hide-more-direct-messages-text"> {{t 'back to channels' }}</span>
</a> </a>
<span class="unread_count"></span>
</div> </div>
<a class="zoom-out-hide" id="hide-more-direct-messages">
<span class="hide-more-direct-messages-text"> {{t 'back to channels' }}</span>
</a>
</div> </div>
</div> </div>
{{~!-- squash whitespace --~}} {{~!-- squash whitespace --~}}

4
web/tests/pm_list.test.js
View File

@@ -12,9 +12,7 @@ run_test("update_dom_with_unread_counts", () => {
let counts; let counts;
const $total_count = $.create("total-count-stub"); const $total_count = $.create("total-count-stub");
const $private_li = $( const $private_li = $(".direct-messages-container #direct-messages-section-header");
".direct-messages-container #direct-messages-section #direct-messages-section-header",
);
$private_li.set_find_results(".unread_count", $total_count); $private_li.set_find_results(".unread_count", $total_count);
counts = { counts = {