paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-15 19:31:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

recent: Rename #recent_topics_filter_buttons.

Browse Source
This commit is contained in:
evykassirer
2023-09-06 14:41:43 -07:00
committed by Tim Abbott
parent f7b96b2bee
commit e5cd59c224
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/e2e-tests/lib/common.ts
View File

@@ -269,7 +269,7 @@ export async function log_in(
await fill_form(page, "#login_form", params); await fill_form(page, "#login_form", params);
await page.$eval("#login_form", (form) => (form as HTMLFormElement).submit()); await page.$eval("#login_form", (form) => (form as HTMLFormElement).submit());
await page.waitForSelector("#recent_topics_filter_buttons", {visible: true}); await page.waitForSelector("#recent_view_filter_buttons", {visible: true});
} }
export async function log_out(page: Page): Promise<void> { export async function log_out(page: Page): Promise<void> {

8
web/src/recent_view_ui.js
View File

@@ -279,7 +279,7 @@ export function revive_current_focus() {
if (!filter_button) { if (!filter_button) {
set_default_focus(); set_default_focus();
} else { } else {
$current_focus_elem = $("#recent_topics_filter_buttons").find( $current_focus_elem = $("#recent_view_filter_buttons").find(
`[data-filter='${CSS.escape(filter_button)}']`, `[data-filter='${CSS.escape(filter_button)}']`,
); );
$current_focus_elem.trigger("focus"); $current_focus_elem.trigger("focus");
@@ -669,7 +669,7 @@ export function set_filter(filter) {
// set `filters`. // set `filters`.
// Get the button which was clicked. // Get the button which was clicked.
const $filter_elem = $("#recent_topics_filter_buttons").find( const $filter_elem = $("#recent_view_filter_buttons").find(
`[data-filter="${CSS.escape(filter)}"]`, `[data-filter="${CSS.escape(filter)}"]`,
); );
@@ -691,13 +691,13 @@ function show_selected_filters() {
// Add `btn-selected-filter` to the buttons to show // Add `btn-selected-filter` to the buttons to show
// which filters are applied. // which filters are applied.
if (filters.size === 0) { if (filters.size === 0) {
$("#recent_topics_filter_buttons") $("#recent_view_filter_buttons")
.find('[data-filter="all"]') .find('[data-filter="all"]')
.addClass("btn-recent-selected") .addClass("btn-recent-selected")
.attr("aria-checked", "true"); .attr("aria-checked", "true");
} else { } else {
for (const filter of filters) { for (const filter of filters) {
$("#recent_topics_filter_buttons") $("#recent_view_filter_buttons")
.find(`[data-filter="${CSS.escape(filter)}"]`) .find(`[data-filter="${CSS.escape(filter)}"]`)
.addClass("btn-recent-selected") .addClass("btn-recent-selected")
.attr("aria-checked", "true"); .attr("aria-checked", "true");

2
web/styles/recent_topics.css
View File

@@ -109,7 +109,7 @@
} }
} }
#recent_topics_filter_buttons { #recent_view_filter_buttons {
padding-top: 12px; padding-top: 12px;
margin: 0 10px; margin: 0 10px;
display: flex; display: flex;

2
web/templates/recent_view_table.hbs
View File

@@ -1,4 +1,4 @@
<div id="recent_topics_filter_buttons" class="btn-group" role="group"> <div id="recent_view_filter_buttons" class="btn-group" role="group">
<div id="recent_filters_group"> <div id="recent_filters_group">
{{> recent_view_filters}} {{> recent_view_filters}}
</div> </div>

10
web/tests/recent_topics.test.js
View File

@@ -399,7 +399,7 @@ function stub_out_filter_buttons() {
for (const filter of ["all", "unread", "muted", "participated", "include_private"]) { for (const filter of ["all", "unread", "muted", "participated", "include_private"]) {
const $stub = $.create(`filter-${filter}-stub`); const $stub = $.create(`filter-${filter}-stub`);
const selector = `[data-filter="${filter}"]`; const selector = `[data-filter="${filter}"]`;
$("#recent_topics_filter_buttons").set_find_results(selector, $stub); $("#recent_view_filter_buttons").set_find_results(selector, $stub);
} }
} }
@@ -608,7 +608,7 @@ test("test_filter_unread", ({mock_template}) => {
false, false,
); );
$("#recent_topics_filter_buttons").removeClass("btn-recent-selected"); $("#recent_view_filter_buttons").removeClass("btn-recent-selected");
expected_filter_unread = true; expected_filter_unread = true;
rt.set_filter("unread"); rt.set_filter("unread");
@@ -661,12 +661,12 @@ test("test_filter_unread", ({mock_template}) => {
// Unselect "unread" filter by clicking twice. // Unselect "unread" filter by clicking twice.
expected_filter_unread = false; expected_filter_unread = false;
$("#recent_topics_filter_buttons").addClass("btn-recent-selected"); $("#recent_view_filter_buttons").addClass("btn-recent-selected");
rt.set_filter("unread"); rt.set_filter("unread");
assert.equal(i, row_data.length); assert.equal(i, row_data.length);
$("#recent_topics_filter_buttons").removeClass("btn-recent-selected"); $("#recent_view_filter_buttons").removeClass("btn-recent-selected");
// reselect "unread" filter // reselect "unread" filter
rt.set_filter("unread"); rt.set_filter("unread");
@@ -740,7 +740,7 @@ test("test_filter_participated", ({mock_template}) => {
// remove muted filter // remove muted filter
rt.set_filter("muted"); rt.set_filter("muted");
$("#recent_topics_filter_buttons").removeClass("btn-recent-selected"); $("#recent_view_filter_buttons").removeClass("btn-recent-selected");
expected_filter_participated = true; expected_filter_participated = true;