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

hotkeys: Fix very recent regression with down key.

Browse Source 
In 1f72647a5a I accidentally
flipped a condition that made the down key "recenter" on
the "normal" case, not in the "is-at-end" case.

This commit undoes that regression, which probably only
affected czo for a weekend, and makes the logic a bit
more clear.
This commit is contained in:
Steve Howell
2018-05-28 22:21:13 +00:00
committed by Tim Abbott
parent 26e1fca7ed
commit 0bc272fc86
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
static/js/navigate.js
View File

@@ -20,23 +20,26 @@ exports.up = function () {
exports.down = function (with_centering) { exports.down = function (with_centering) {
message_viewport.last_movement_direction = 1; message_viewport.last_movement_direction = 1;
if (current_msg_list.is_at_end()) {
if (with_centering) {
// At the last message, scroll to the bottom so we have
// lots of nice whitespace for new messages coming in.
var current_msg_table = rows.get_table(current_msg_list.table_name);
message_viewport.scrollTop(current_msg_table.safeOuterHeight(true) -
message_viewport.height() * 0.1);
unread_ops.mark_current_list_as_read();
}
return;
}
// Normal path starts here.
var msg_id = current_msg_list.next(); var msg_id = current_msg_list.next();
if (msg_id === undefined) { if (msg_id === undefined) {
return; return;
} }
go_to_row(msg_id); go_to_row(msg_id);
if (with_centering) {
// At the last message, scroll to the bottom so we have
// lots of nice whitespace for new messages coming in.
//
// FIXME: this doesn't work for End because rows.last_visible()
// always returns a message.
var current_msg_table = rows.get_table(current_msg_list.table_name);
message_viewport.scrollTop(current_msg_table.safeOuterHeight(true) -
message_viewport.height() * 0.1);
unread_ops.mark_current_list_as_read();
}
}; };
exports.to_home = function () { exports.to_home = function () {