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

left_sidebar: Use DM identifiers on DM containers.

Browse Source
This commit is contained in:
Karl Stolley
2023-10-30 10:07:07 -05:00
committed by Tim Abbott
parent f496b40cd6
commit 01ca3e119b
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/click_handlers.js
View File

@@ -713,7 +713,7 @@ export function initialize() {
$("body").on( $("body").on(
"click", "click",
".private_messages_container.zoom-out #private_messages_section_header", ".direct-messages-container.zoom-out #private_messages_section_header",
(e) => { (e) => {
if ($(e.target).closest("#show_all_private_messages").length === 1) { if ($(e.target).closest("#show_all_private_messages").length === 1) {
// Let the browser handle the "all direct messages" widget. // Let the browser handle the "all direct messages" widget.
@@ -747,7 +747,7 @@ export function initialize() {
* this click handler rather than just a link. */ * this click handler rather than just a link. */
$("body").on( $("body").on(
"click", "click",
".private_messages_container.zoom-in #private_messages_section_header", ".direct-messages-container.zoom-in #private_messages_section_header",
(e) => { (e) => {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();

14
web/src/pm_list.js
View File

@@ -21,7 +21,7 @@ let zoomed = false;
function get_private_messages_section_header() { function get_private_messages_section_header() {
return $( return $(
".private_messages_container #private_messages_section #private_messages_section_header", ".direct-messages-container #private_messages_section #private_messages_section_header",
); );
} }
@@ -118,11 +118,11 @@ export function update_dom_with_unread_counts(counts) {
} }
export function highlight_all_private_messages_view() { export function highlight_all_private_messages_view() {
$(".private_messages_container").addClass("active_private_messages_section"); $(".direct-messages-container").addClass("active_private_messages_section");
} }
function unhighlight_all_private_messages_view() { function unhighlight_all_private_messages_view() {
$(".private_messages_container").removeClass("active_private_messages_section"); $(".direct-messages-container").removeClass("active_private_messages_section");
} }
function scroll_pm_into_view($target_li) { function scroll_pm_into_view($target_li) {
@@ -188,7 +188,7 @@ export function toggle_private_messages_section() {
function zoom_in() { function zoom_in() {
zoomed = true; zoomed = true;
update_private_messages(); update_private_messages();
$(".private_messages_container").removeClass("zoom-out").addClass("zoom-in"); $(".direct-messages-container").removeClass("zoom-out").addClass("zoom-in");
$("#streams_list").hide(); $("#streams_list").hide();
$(".left-sidebar .right-sidebar-items").hide(); $(".left-sidebar .right-sidebar-items").hide();
} }
@@ -196,20 +196,20 @@ function zoom_in() {
function zoom_out() { function zoom_out() {
zoomed = false; zoomed = false;
update_private_messages(); update_private_messages();
$(".private_messages_container").removeClass("zoom-in").addClass("zoom-out"); $(".direct-messages-container").removeClass("zoom-in").addClass("zoom-out");
$("#streams_list").show(); $("#streams_list").show();
$(".left-sidebar .right-sidebar-items").show(); $(".left-sidebar .right-sidebar-items").show();
} }
export function initialize() { export function initialize() {
$(".private_messages_container").on("click", "#show-more-direct-messages", (e) => { $(".direct-messages-container").on("click", "#show-more-direct-messages", (e) => {
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
zoom_in(); zoom_in();
}); });
$(".private_messages_container").on("click", "#hide-more-direct-messages", (e) => { $(".direct-messages-container").on("click", "#hide-more-direct-messages", (e) => {
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();

2
web/src/tippyjs.js
View File

@@ -423,7 +423,7 @@ export function initialize() {
delegate("body", { delegate("body", {
target: "#pm_tooltip_container", target: "#pm_tooltip_container",
onShow(instance) { onShow(instance) {
if ($(".private_messages_container").hasClass("zoom-in")) { if ($(".direct-messages-container").hasClass("zoom-in")) {
return false; return false;
} }

2
web/styles/dark_theme.css
View File

@@ -224,7 +224,7 @@
.app-main, .app-main,
.column-middle, .column-middle,
#streams_header, #streams_header,
.private_messages_container { .direct-messages-container {
background-color: var(--color-background); background-color: var(--color-background);
} }

4
web/styles/left_sidebar.css
View File

@@ -219,7 +219,7 @@ li.show-more-topics {
width: 100%; width: 100%;
} }
.private_messages_container { .direct-messages-container {
margin-right: 16px; margin-right: 16px;
margin-left: 6px; margin-left: 6px;
z-index: 1; z-index: 1;
@@ -1168,7 +1168,7 @@ li.topic-list-item {
display: none; display: none;
} }
&.private_messages_container ul.pm-list { &.direct-messages-container ul.pm-list {
margin-bottom: $bottom_scrolling_buffer; margin-bottom: $bottom_scrolling_buffer;
} }

4
web/templates/left_sidebar.hbs
View File

@@ -129,7 +129,7 @@
</ul> </ul>
</div> </div>
<div id="private_messages_sticky_header" class="private_messages_container zoom-out hidden-for-spectators"> <div id="private_messages_sticky_header" class="direct-messages-container zoom-out hidden-for-spectators">
<div id="private_messages_section"> <div id="private_messages_section">
<div id="private_messages_section_header" class="zoom-out zoom-in-sticky"> <div id="private_messages_section_header" class="zoom-out zoom-in-sticky">
<span id="pm_tooltip_container"> <span id="pm_tooltip_container">
@@ -148,7 +148,7 @@
</div> </div>
{{~!-- squash whitespace --~}} {{~!-- squash whitespace --~}}
<div id="left_sidebar_scroll_container" class="scrolling_list" data-simplebar> <div id="left_sidebar_scroll_container" class="scrolling_list" data-simplebar>
<div class="private_messages_container zoom-out hidden-for-spectators"> <div class="direct-messages-container zoom-out hidden-for-spectators">
<div id="private_messages_list"></div> <div id="private_messages_list"></div>
</div> </div>

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

@@ -18,7 +18,7 @@ run_test("update_dom_with_unread_counts", () => {
const $total_count = $.create("total-count-stub"); const $total_count = $.create("total-count-stub");
const $private_li = $( const $private_li = $(
".private_messages_container #private_messages_section #private_messages_section_header", ".direct-messages-container #private_messages_section #private_messages_section_header",
); );
$private_li.set_find_results(".unread_count", $total_count); $private_li.set_find_results(".unread_count", $total_count);