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

Move message filtering from add_to_table to add_messages_helper

Browse Source 
(imported from commit 45b1149771a0d96af4c6267fc8457e49c3d10799)
This commit is contained in:
Zev Benjamin
2013-02-19 19:16:50 -05:00
parent 9cac51d0b5
commit a91aa7f8f5
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
zephyr/static/js/zephyr.js
View File

@@ -356,7 +356,7 @@ function add_display_time(message, prev) {
' (UTC' + ((tz_offset < 0) ? '' : '+') + tz_offset + ')'; ' (UTC' + ((tz_offset < 0) ? '' : '+') + tz_offset + ')';
} }
function add_to_table(messages, msg_list, filter_function, where, allow_collapse) { function add_to_table(messages, msg_list, where, allow_collapse) {
if (messages.length === 0) if (messages.length === 0)
return; return;
@@ -394,9 +394,6 @@ function add_to_table(messages, msg_list, filter_function, where, allow_collapse
} }
$.each(messages, function (index, message) { $.each(messages, function (index, message) {
if (! filter_function(message))
return;
message.include_recipient = false; message.include_recipient = false;
message.include_bookend = false; message.include_bookend = false;
if (same_recipient(prev, message) && allow_collapse) { if (same_recipient(prev, message) && allow_collapse) {
@@ -565,10 +562,12 @@ function add_messages_helper(messages, msg_list, predicate, allow_collapse, appe
var center_message_id = msg_list.selected_id; var center_message_id = msg_list.selected_id;
// center_message_id is guaranteed to be between the top and bottom // center_message_id is guaranteed to be between the top and bottom
var top_messages = $.grep(messages, function (elem, idx) { var top_messages = $.grep(messages, function (elem, idx) {
return (elem.id < center_message_id && msg_list.get(elem.id) === undefined); return (elem.id < center_message_id && msg_list.get(elem.id) === undefined
&& predicate(elem));
}); });
var bottom_messages = $.grep(messages, function (elem, idx) { var bottom_messages = $.grep(messages, function (elem, idx) {
return (elem.id >= center_message_id && msg_list.get(elem.id) === undefined); return (elem.id >= center_message_id && msg_list.get(elem.id) === undefined
&& predicate(elem));
}); });
if (append_new_messages) { if (append_new_messages) {
@@ -576,8 +575,8 @@ function add_messages_helper(messages, msg_list, predicate, allow_collapse, appe
msg_list.append(bottom_messages); msg_list.append(bottom_messages);
} }
add_to_table(top_messages, msg_list, predicate, "top", allow_collapse); add_to_table(top_messages, msg_list, "top", allow_collapse);
add_to_table(bottom_messages, msg_list, predicate, "bottom", allow_collapse); add_to_table(bottom_messages, msg_list, "bottom", allow_collapse);
return top_messages.length > 0; return top_messages.length > 0;
} }