paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-31 03:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

buddy list: Rename user_presences to buddy-list-users-matching-view.

Browse Source 
This switches to our preferred dash-separated classnames
instead of underscore-separated, and also updates the
classname to be differentiable from users that aren't
part of the current narrow.

Until the next commit that splits the buddy list, the
name is a bit inaccurate since it still contains all
the users.
This commit is contained in:
evykassirer
2023-08-22 22:54:50 -07:00
committed by Tim Abbott
parent beead8e614
commit 1f8db236f5
11 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
web/e2e-tests/message-basics.test.ts
View File

@@ -395,21 +395,24 @@ async function test_stream_search_filters_stream_list(page: Page): Promise<void>
async function test_users_search(page: Page): Promise<void> {
console.log("Search users using right sidebar");
async function assert_in_list(page: Page, name: string): Promise<void> {
await page.waitForSelector(`#user_presences li [data-name="${CSS.escape(name)}"]`, {
visible: true,
});
await page.waitForSelector(
`#buddy-list-users-matching-view li [data-name="${CSS.escape(name)}"]`,
{
visible: true,
},
);
}
async function assert_selected(page: Page, name: string): Promise<void> {
await page.waitForSelector(
`#user_presences li.highlighted_user [data-name="${CSS.escape(name)}"]`,
`#buddy-list-users-matching-view li.highlighted_user [data-name="${CSS.escape(name)}"]`,
{visible: true},
);
}
async function assert_not_selected(page: Page, name: string): Promise<void> {
await page.waitForSelector(
`#user_presences li.highlighted_user [data-name="${CSS.escape(name)}"]`,
`#buddy-list-users-matching-view li.highlighted_user [data-name="${CSS.escape(name)}"]`,
{hidden: true},
);
}
@@ -421,7 +424,9 @@ async function test_users_search(page: Page): Promise<void> {
// Enter the search box and test selected suggestion navigation
await page.click("#user_filter_icon");
await page.waitForSelector("#user_presences .highlighted_user", {visible: true});
await page.waitForSelector("#buddy-list-users-matching-view .highlighted_user", {
visible: true,
});
await assert_selected(page, "Desdemona");
await assert_not_selected(page, "Cordelia, Lear's daughter");
await assert_not_selected(page, "King Hamlet");
@@ -443,9 +448,12 @@ async function test_users_search(page: Page): Promise<void> {
await arrow(page, "Down");
// Now Iago must be highlighted
await page.waitForSelector('#user_presences li.highlighted_user [data-name="Iago"]', {
visible: true,
});
await page.waitForSelector(
'#buddy-list-users-matching-view li.highlighted_user [data-name="Iago"]',
{
visible: true,
},
);
await assert_not_selected(page, "King Hamlet");
await assert_not_selected(page, "aaron");
await assert_not_selected(page, "Desdemona");

2
web/src/buddy_list.js
View File

@@ -10,7 +10,7 @@ import * as padded_widget from "./padded_widget";
import * as scroll_util from "./scroll_util";
class BuddyListConf {
container_sel = "#user_presences";
container_sel = "#buddy-list-users-matching-view";
scroll_container_sel = "#buddy_list_wrapper";
item_sel = "li.user_sidebar_entry";
padding_sel = "#buddy_list_wrapper_padding";

14
web/src/click_handlers.js
View File

@@ -472,7 +472,7 @@ export function initialize() {
});
// SIDEBARS
$("#user_presences")
$("#buddy-list-users-matching-view")
.expectOne()
.on("click", ".selectable_sidebar_block", (e) => {
const $li = $(e.target).parents("li");
@@ -547,7 +547,7 @@ export function initialize() {
}
// BUDDY LIST TOOLTIPS (not displayed on touch devices)
$("#user_presences").on("mouseenter", ".selectable_sidebar_block", (e) => {
$("#buddy-list-users-matching-view").on("mouseenter", ".selectable_sidebar_block", (e) => {
e.stopPropagation();
const $elem = $(e.currentTarget).closest(".user_sidebar_entry").find(".user-presence-link");
const user_id_string = $elem.attr("data-user-id");
@@ -555,7 +555,7 @@ export function initialize() {
// `target_node` is the `ul` element since it stays in DOM even after updates.
function get_target_node() {
return document.querySelector("#user_presences");
return document.querySelector("#buddy-list-users-matching-view");
}
function check_reference_removed(mutation, instance) {
@@ -623,9 +623,11 @@ export function initialize() {
// MISC
{
const sel = ["#stream_filters", "#left-sidebar-navigation-list", "#user_presences"].join(
", ",
);
const sel = [
"#stream_filters",
"#left-sidebar-navigation-list",
"#buddy-list-users-matching-view",
].join(", ");
$(sel).on("click", "a", function () {
this.blur();

2
web/src/list_util.ts
View File

@@ -3,7 +3,7 @@ import $ from "jquery";
const list_selectors = [
"#stream_filters",
"#left-sidebar-navigation-list",
"#user_presences",
"#buddy-list-users-matching-view",
"#send_later_options",
];

4
web/src/ui_init.js
View File

@@ -186,7 +186,7 @@ function initialize_right_sidebar() {
);
}
$("#user_presences").on("mouseenter", ".user_sidebar_entry", (e) => {
$("#buddy-list-users-matching-view").on("mouseenter", ".user_sidebar_entry", (e) => {
const $status_emoji = $(e.target).closest(".user_sidebar_entry").find("img.status-emoji");
if ($status_emoji.length) {
const animated_url = $status_emoji.data("animated-url");
@@ -196,7 +196,7 @@ function initialize_right_sidebar() {
}
});
$("#user_presences").on("mouseleave", ".user_sidebar_entry", (e) => {
$("#buddy-list-users-matching-view").on("mouseleave", ".user_sidebar_entry", (e) => {
const $status_emoji = $(e.target).closest(".user_sidebar_entry").find("img.status-emoji");
if ($status_emoji.length) {
const still_url = $status_emoji.data("still-url");

4
web/src/user_card_popover.js
View File

@@ -787,13 +787,13 @@ function register_click_handlers() {
$("body").on("click", ".update_status_text", open_user_status_modal);
// Clicking on one's own status emoji should open the user status modal.
$("#user_presences").on(
$("#buddy-list-users-matching-view").on(
"click",
".user_sidebar_entry_me .status-emoji",
open_user_status_modal,
);
$("#user_presences").on("click", ".user-list-sidebar-menu-icon", (e) => {
$("#buddy-list-users-matching-view").on("click", ".user-list-sidebar-menu-icon", (e) => {
e.stopPropagation();
const $target = $(e.currentTarget).closest("li");

4
web/styles/dark_theme.css
View File

@@ -756,8 +756,8 @@
}
}
#user_presences li:hover,
#user_presences li.highlighted_user {
#buddy-list-users-matching-view li:hover,
#buddy-list-users-matching-view li.highlighted_user {
background-color: hsl(136deg 25% 73% / 20%);
}

2
web/styles/right_sidebar.css
View File

@@ -13,7 +13,7 @@ $user_status_emoji_width: 24px;
overflow: auto;
}
#user_presences {
#buddy-list-users-matching-view {
max-width: 95%;
overflow-x: hidden;
list-style-position: inside; /* Draw the bullets inside our box */

2
web/templates/right_sidebar.hbs
View File

@@ -18,7 +18,7 @@
</button>
</div>
<div id="buddy_list_wrapper" class="scrolling_list" data-simplebar>
<ul id="user_presences" class="filters" data-search-results-empty="{{t 'No matching users.' }}"></ul>
<ul id="buddy-list-users-matching-view" class="filters" data-search-results-empty="{{t 'No matching users.' }}"></ul>
<div id="buddy_list_wrapper_padding"></div>
</div>
</div>

8
web/tests/activity.test.js
View File

@@ -247,7 +247,7 @@ function buddy_list_add(user_id, $stub) {
}
$stub.length = 1;
const sel = `li.user_sidebar_entry[data-user-id='${CSS.escape(user_id)}']`;
$("#user_presences").set_find_results(sel, $stub);
$("#buddy-list-users-matching-view").set_find_results(sel, $stub);
}
test("direct_message_update_dom_counts", () => {
@@ -305,7 +305,7 @@ test("handlers", ({override, mock_template}) => {
keys: [me.user_id, alice.user_id, fred.user_id],
});
activity_ui.set_cursor_and_filter();
$("#user_presences").empty = () => {};
$("#buddy-list-users-matching-view").empty = () => {};
$me_li = $.create("me stub");
$alice_li = $.create("alice stub");
@@ -599,7 +599,7 @@ test("realm_presence_disabled", () => {
test("redraw_muted_user", () => {
muted_users.add_muted_user(mark.user_id);
activity_ui.redraw_user(mark.user_id);
assert.equal($("#user_presences").html(), "never-been-set");
assert.equal($("#buddy-list-users-matching-view").html(), "never-been-set");
});
test("update_presence_info", ({override}) => {
@@ -655,7 +655,7 @@ test("initialize", ({override, mock_template}) => {
function clear() {
$.clear_all_elements();
buddy_list.$container = $("#user_presences");
buddy_list.$container = $("#buddy-list-users-matching-view");
buddy_list.$container.append = () => {};
clear_buddy_list();
page_params.presences = {};

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

@@ -72,7 +72,7 @@ run_test("basics", ({override}) => {
override(padded_widget, "update_padding", () => {});
let appended;
$("#user_presences").append = (html) => {
$("#buddy-list-users-matching-view").append = (html) => {
assert.equal(html, "html-stub");
appended = true;
};