Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

recent_topics: Extract function to check `table` focus.

This commit is contained in:
Aman Agrawal 2021-04-02 10:36:02 +00:00 committed by Tim Abbott
parent 6dc783e562
commit 1d12fb0bb9
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
static/js/recent_topics.js
View File

@ -94,6 +94,10 @@ export function load_filters() {
filters = new Set(ls.get(ls_key)); filters = new Set(ls.get(ls_key));
} }
function is_table_focused() {
return current_focus_elem === "table";
}
export function set_default_focus() { export function set_default_focus() {
// If at any point we are confused about the currently // If at any point we are confused about the currently
// focused element, we switch focus to search. // focused element, we switch focus to search.
@ -134,7 +138,7 @@ function revive_current_focus() {
return false; return false;
} }
if (current_focus_elem === "table") { if (is_table_focused()) {
set_table_focus(row_focus, col_focus); set_table_focus(row_focus, col_focus);
return true; return true;
} }
@ -639,7 +643,7 @@ export function change_focused_element($elt, input_key) {
current_focus_elem = $("#recent_topics_search"); current_focus_elem = $("#recent_topics_search");
return true; return true;
case "escape": case "escape":
if (current_focus_elem === "table") { if (is_table_focused()) {
return false; return false;
} }
set_table_focus(row_focus, col_focus); set_table_focus(row_focus, col_focus);
@ -673,13 +677,13 @@ export function change_focused_element($elt, input_key) {
set_table_focus(row_focus, col_focus); set_table_focus(row_focus, col_focus);
return true; return true;
case "escape": case "escape":
if (current_focus_elem === "table") { if (is_table_focused()) {
return false; return false;
} }
set_table_focus(row_focus, col_focus); set_table_focus(row_focus, col_focus);
return true; return true;
} }
} else if (current_focus_elem === "table") { } else if (is_table_focused()) {
// For arrowing around the table of topics, we implement left/right // For arrowing around the table of topics, we implement left/right
// wraparound. Going off the top or the bottom takes one // wraparound. Going off the top or the bottom takes one
// to the navigation at the top (see set_table_focus). // to the navigation at the top (see set_table_focus).