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

web: Convert .data("search-results-empty") to .attr.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2024-05-02 17:29:50 -07:00
committed by Tim Abbott
parent ebea1eed18
commit 153847d617
6 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/activity_ui.ts
View File

@@ -83,7 +83,7 @@ export function searching(): boolean {
} }
export function render_empty_user_list_message_if_needed($container: JQuery): void { export function render_empty_user_list_message_if_needed($container: JQuery): void {
const empty_list_message = $container.data("search-results-empty"); const empty_list_message = $container.attr("data-search-results-empty");
if (!empty_list_message || $container.children().length) { if (!empty_list_message || $container.children().length) {
return; return;

9
web/src/buddy_list.ts
View File

@@ -291,8 +291,8 @@ export class BuddyList extends BuddyListConf {
} }
} }
$("#buddy-list-users-matching-view").data( $("#buddy-list-users-matching-view").attr(
"search-results-empty", "data-search-results-empty",
matching_view_empty_list_message, matching_view_empty_list_message,
); );
if ($("#buddy-list-users-matching-view .empty-list-message").length) { if ($("#buddy-list-users-matching-view .empty-list-message").length) {
@@ -302,7 +302,10 @@ export class BuddyList extends BuddyListConf {
$("#buddy-list-users-matching-view").html(empty_list_widget_html); $("#buddy-list-users-matching-view").html(empty_list_widget_html);
} }
$("#buddy-list-other-users").data("search-results-empty", other_users_empty_list_message); $("#buddy-list-other-users").attr(
"data-search-results-empty",
other_users_empty_list_message,
);
if ($("#buddy-list-other-users .empty-list-message").length) { if ($("#buddy-list-other-users .empty-list-message").length) {
const empty_list_widget_html = render_empty_list_widget_for_list({ const empty_list_widget_html = render_empty_list_widget_for_list({
other_users_empty_list_message, other_users_empty_list_message,

2
web/src/list_widget.ts
View File

@@ -215,7 +215,7 @@ export function render_empty_list_message_if_needed(
): void { ): void {
let empty_list_message = $container.data("empty"); let empty_list_message = $container.data("empty");
const empty_search_results_message = $container.data("search-results-empty"); const empty_search_results_message = $container.attr("data-search-results-empty");
if (filter_value && empty_search_results_message) { if (filter_value && empty_search_results_message) {
empty_list_message = empty_search_results_message; empty_list_message = empty_search_results_message;
} }

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

@@ -489,7 +489,8 @@ test("render_empty_user_list_message", ({override, mock_template}) => {
append($data) { append($data) {
$appended_data = $data; $appended_data = $data;
}, },
data() { attr(name) {
assert.equal(name, "data-search-results-empty");
return empty_list_message; return empty_list_message;
}, },
children: () => [], children: () => [],

1
web/tests/list_widget.test.js
View File

@@ -45,6 +45,7 @@ const ListWidget = zrequire("list_widget");
function make_container() { function make_container() {
const $container = {}; const $container = {};
$container.attr = noop;
$container.empty = noop; $container.empty = noop;
$container.data = noop; $container.data = noop;

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

@@ -10,10 +10,10 @@ const {realm} = require("./lib/zpage_params");
const fake_buddy_list = { const fake_buddy_list = {
scroll_container_selector: "#whatever", scroll_container_selector: "#whatever",
$users_matching_view_container: { $users_matching_view_container: {
data() {}, attr() {},
}, },
$other_users_container: { $other_users_container: {
data() {}, attr() {},
}, },
find_li() {}, find_li() {},
first_key() {}, first_key() {},