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

Fix traceback when unnarrowing before home message list has loaded.

Browse Source 
If we load a browser window in a narrowed view and then un-narrow
before the home message list has loaded, we end up attempting to
select message ID -1 from home_msg_list even though it is empty,
triggering a traceback.

(imported from commit eb8b686f6e9c1fa518028e5755ac6196781e92d7)
This commit is contained in:
Tim Abbott
2013-12-02 13:16:37 -05:00
parent da1466cfa9
commit ef906c3cd3
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
static/js/narrow.js
View File

@@ -378,29 +378,31 @@ exports.deactivate = function () {
message_tour.finish_tour(); message_tour.finish_tour();
current_msg_list = home_msg_list; current_msg_list = home_msg_list;
var preserve_pre_narrowing_screen_position = if (current_msg_list.selected_id() !== -1) {
(current_msg_list.selected_row().length > 0) && var preserve_pre_narrowing_screen_position =
(current_msg_list.pre_narrow_offset !== undefined); (current_msg_list.selected_row().length > 0) &&
(current_msg_list.pre_narrow_offset !== undefined);
if (feature_flags.summarize_read_while_narrowed) { if (feature_flags.summarize_read_while_narrowed) {
// TODO: avoid a full re-render // TODO: avoid a full re-render
// Necessary to replace messages read in the narrow with summary blocks // Necessary to replace messages read in the narrow with summary blocks
current_msg_list.start_summary_exemption(); current_msg_list.start_summary_exemption();
current_msg_list.rerender(); current_msg_list.rerender();
} }
// We fall back to the closest selected id, if the user has removed a stream from the home // We fall back to the closest selected id, if the user has removed a stream from the home
// view since leaving it the old selected id might no longer be there // view since leaving it the old selected id might no longer be there
current_msg_list.select_id(current_msg_list.selected_id(), { current_msg_list.select_id(current_msg_list.selected_id(), {
then_scroll: !preserve_pre_narrowing_screen_position, then_scroll: !preserve_pre_narrowing_screen_position,
use_closest: true use_closest: true
}); });
if (preserve_pre_narrowing_screen_position) { if (preserve_pre_narrowing_screen_position) {
// We scroll the user back to exactly the offset from the selected // We scroll the user back to exactly the offset from the selected
// message that he was at the time that he narrowed. // message that he was at the time that he narrowed.
// TODO: Make this correctly handle the case of resizing while narrowed. // TODO: Make this correctly handle the case of resizing while narrowed.
viewport.scrollTop(current_msg_list.selected_row().offset().top - current_msg_list.pre_narrow_offset); viewport.scrollTop(current_msg_list.selected_row().offset().top - current_msg_list.pre_narrow_offset);
}
} }
hashchange.save_narrow(); hashchange.save_narrow();