paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

recent: Simplify down arrow navigation.

Browse Source 
Fixes #23331

Combine checks for last row between `vim_dowm` and `down_arrow`.

Check for the presence of unread counter in `set_table_focus`
directly so that it can be used in other cases as well. This is
especially useful when marking the last row in the table as read.
This commit is contained in:
Aman Agrawal
2022-10-30 05:53:27 +00:00
committed by Tim Abbott
parent c41c94e36e
commit 4bd46f1cb4
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
static/js/recent_topics_ui.js
View File

@@ -164,6 +164,10 @@ function set_table_focus(row, col, using_keyboard) {
return true;
}
if (col === 2 && !has_unread(row)) {
col = 1;
col_focus = 1;
}
const $topic_row = $topic_rows.eq(row);
// We need to allow table to render first before setting focus.
setTimeout(
@@ -911,13 +915,7 @@ function up_arrow_navigation(row, col) {
}
}
function down_arrow_navigation(row, col) {
if (is_focus_at_last_table_row()) {
return;
}
if (col === 2 && !has_unread(row + 1)) {
col_focus = 1;
}
function down_arrow_navigation() {
row_focus += 1;
}
@@ -1103,6 +1101,7 @@ export function change_focused_element($elt, input_key) {
case "right_arrow":
right_arrow_navigation(row_focus, col_focus);
break;
case "down_arrow":
case "vim_down":
// We stop user at last table row
// so that user doesn't end up in
@@ -1114,10 +1113,7 @@ export function change_focused_element($elt, input_key) {
if (is_focus_at_last_table_row()) {
return true;
}
down_arrow_navigation(row_focus, col_focus);
break;
case "down_arrow":
down_arrow_navigation(row_focus, col_focus);
down_arrow_navigation();
break;
case "vim_up":
// See comment on vim_down.