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

Handle having no selected message more gracefully

Browse Source 
(imported from commit ba00c012061b35dfe490bf1312b3fa78a4f6582f)
This commit is contained in:
Keegan McAllister
2012-10-23 16:50:22 -04:00
parent 0744332658
commit afdd3af1b6
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zephyr/static/js/narrow.js
View File

@@ -48,8 +48,10 @@ function do_narrow(description, filter_function) {
// is temporarily selected // is temporarily selected
select_message_by_id(selected_message_id, {then_scroll: false}); select_message_by_id(selected_message_id, {then_scroll: false});
selected_message_class = "narrowed_selected_message"; selected_message_class = "narrowed_selected_message";
select_message_by_id(target_id, {then_scroll: true}); if (select_message_by_id(target_id, {then_scroll: true})) {
scroll_to_selected(); // Can only scroll if the message exists
scroll_to_selected();
}
} }
// This is the message we're about to select, within the narrowed view. // This is the message we're about to select, within the narrowed view.

5
zephyr/static/js/zephyr.js
View File

@@ -121,7 +121,8 @@ function recenter_view(message) {
} }
function scroll_to_selected() { function scroll_to_selected() {
recenter_view(selected_message); if (selected_message && (selected_message.length !== 0))
recenter_view(selected_message);
} }
function get_huddle_recipient(message) { function get_huddle_recipient(message) {
@@ -749,6 +750,8 @@ function at_bottom_of_viewport() {
function keep_pointer_in_view() { function keep_pointer_in_view() {
var candidate; var candidate;
var next_message = rows.get(selected_message_id); var next_message = rows.get(selected_message_id);
if (next_message.length === 0)
return;
if (above_view_threshold(next_message) && (!at_top_of_viewport())) { if (above_view_threshold(next_message) && (!at_top_of_viewport())) {
while (above_view_threshold(next_message)) { while (above_view_threshold(next_message)) {