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

Move seemless reposition on render code into _maybe_rerender

Browse Source 
We also needed this when rerendering on append, so moving it into
_maybe_rerender allows the two places to share the code.

(imported from commit 027d99cae7864747cf1ec94c95e8ece495b5c907)
This commit is contained in:
Zev Benjamin
2013-03-13 13:48:02 -04:00
parent 5ce3a41e6d
commit b9dd227bb5
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
zephyr/static/js/message_list.js
View File

@@ -99,25 +99,10 @@ MessageList.prototype = {
id = this.closest_id(id); id = this.closest_id(id);
opts.id = id; opts.id = id;
} }
this._selected_id = id;
// This is the number of pixels between the top of the this._selected_id = id;
// viewable window and the newly selected message this._maybe_rerender();
var scrolltop_offset;
var selected_row = rows.get(id, this.table_name);
var new_msg_in_view = (selected_row.length > 0);
if (new_msg_in_view) {
scrolltop_offset = viewport.scrollTop() - selected_row.offset().top;
}
if (this._maybe_rerender()) {
// If we could see the newly selected message, scroll the
// window such that the newly selected message is at the
// same location as it would have been before we
// re-rendered.
if (new_msg_in_view) {
viewport.scrollTop(rows.get(id, this.table_name).offset().top + scrolltop_offset);
}
}
$(document).trigger($.Event('message_selected.zephyr', opts)); $(document).trigger($.Event('message_selected.zephyr', opts));
}, },
@@ -203,10 +188,28 @@ MessageList.prototype = {
this._render_win_end = Math.min(this._render_win_start + this._RENDER_WINDOW_SIZE, this._render_win_end = Math.min(this._render_win_start + this._RENDER_WINDOW_SIZE,
this._items.length); this._items.length);
// scrolltop_offset is the number of pixels between the top of the
// viewable window and the newly selected message
var scrolltop_offset;
var selected_row = rows.get(this._selected_id, this.table_name);
var selected_in_view = (selected_row.length > 0);
if (selected_in_view) {
scrolltop_offset = viewport.scrollTop() - selected_row.offset().top;
}
this._clear_table(); this._clear_table();
this._render(this._items.slice(this._render_win_start, this._render(this._items.slice(this._render_win_start,
this._render_win_end), this._render_win_end),
'bottom', true); 'bottom', true);
// If we could see the newly selected message, scroll the
// window such that the newly selected message is at the
// same location as it would have been before we
// re-rendered.
if (selected_in_view) {
viewport.scrollTop(rows.get(this._selected_id, this.table_name).offset().top + scrolltop_offset);
}
return true; return true;
}, },