Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix tracebacks related to direct use of msg_list._items. 

We had debug code that was reaching into msg_list._items when
it could use msg_list.all_messages() instead.

When we split out MessageListData, using _items started
breaking this code.
This commit is contained in:
Steve Howell 2018-05-25 12:37:06 +00:00 committed by Tim Abbott
parent 683fbf68ce
commit 034164945f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/narrow.js
View File

@ -50,7 +50,7 @@ exports.save_pre_narrow_offset_for_reload = function () {
blueslip.debug("narrow.activate missing selected row", { blueslip.debug("narrow.activate missing selected row", {
selected_id: current_msg_list.selected_id(), selected_id: current_msg_list.selected_id(),
selected_idx: current_msg_list.selected_idx(), selected_idx: current_msg_list.selected_idx(),
selected_idx_exact: current_msg_list._items.indexOf( selected_idx_exact: current_msg_list.all_messages().indexOf(
current_msg_list.get(current_msg_list.selected_id())), current_msg_list.get(current_msg_list.selected_id())),
render_start: current_msg_list.view._render_win_start, render_start: current_msg_list.view._render_win_start,
render_end: current_msg_list.view._render_win_end, render_end: current_msg_list.view._render_win_end,

9
static/js/ui_init.js
View File

@ -183,17 +183,18 @@ function initialize_kitchen_sink_stuff() {
if (event.then_scroll) { if (event.then_scroll) {
if (row.length === 0) { if (row.length === 0) {
var row_from_dom = current_msg_list.get_row(event.id); var row_from_dom = current_msg_list.get_row(event.id);
var messages = event.msg_list.all_messages();
blueslip.debug("message_selected missing selected row", { blueslip.debug("message_selected missing selected row", {
previously_selected: event.previously_selected, previously_selected: event.previously_selected,
selected_id: event.id, selected_id: event.id,
selected_idx: event.msg_list.selected_idx(), selected_idx: event.msg_list.selected_idx(),
selected_idx_exact: event.msg_list._items.indexOf(event.msg_list.get(event.id)), selected_idx_exact: messages.indexOf(event.msg_list.get(event.id)),
render_start: event.msg_list.view._render_win_start, render_start: event.msg_list.view._render_win_start,
render_end: event.msg_list.view._render_win_end, render_end: event.msg_list.view._render_win_end,
selected_id_from_idx: event.msg_list._items[event.msg_list.selected_idx()].id, selected_id_from_idx: messages[event.msg_list.selected_idx()].id,
msg_list_sorted: _.isEqual( msg_list_sorted: _.isEqual(
_.pluck(event.msg_list._items, 'id'), _.pluck(messages, 'id'),
_.chain(current_msg_list._items).pluck('id').clone().value().sort() _.chain(current_msg_list.all_messages()).pluck('id').clone().value().sort()
), ),
found_in_dom: row_from_dom.length, found_in_dom: row_from_dom.length,
}); });